From 42b55fd117d3978c8d45a3a4a8e70b945f3f9a97 Mon Sep 17 00:00:00 2001
From: Michael Rosenberg <micro@fastmail.com>
Date: Fri, 11 Aug 2023 11:38:43 -0400
Subject: [PATCH] ed: Bump ed25519-dalek to 2.0.0 (#559)

* Made clippy happy
---
 curve25519-dalek-derive/src/lib.rs |  4 ++--
 curve25519-dalek/src/ristretto.rs  |  2 +-
 ed25519-dalek/Cargo.toml           |  2 +-
 ed25519-dalek/README.md            | 12 +-----------
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/curve25519-dalek-derive/src/lib.rs b/curve25519-dalek-derive/src/lib.rs
index 5387749..6e5920b 100644
--- a/curve25519-dalek-derive/src/lib.rs
+++ b/curve25519-dalek-derive/src/lib.rs
@@ -110,8 +110,8 @@ pub fn unsafe_target_feature_specialize(
         let features: Vec<_> = attributes
             .lit()
             .value()
-            .split(",")
-            .map(|feature| feature.replace(" ", ""))
+            .split(',')
+            .map(|feature| feature.replace(' ', ""))
             .collect();
         let name = format!("{}_{}", item_mod.ident, features.join("_"));
         let ident = syn::Ident::new(&name, item_mod.ident.span());
diff --git a/curve25519-dalek/src/ristretto.rs b/curve25519-dalek/src/ristretto.rs
index 03fa343..ac6060a 100644
--- a/curve25519-dalek/src/ristretto.rs
+++ b/curve25519-dalek/src/ristretto.rs
@@ -970,7 +970,7 @@ impl VartimeMultiscalarMul for RistrettoPoint {
         I::Item: Borrow<Scalar>,
         J: IntoIterator<Item = Option<RistrettoPoint>>,
     {
-        let extended_points = points.into_iter().map(|opt_P| opt_P.map(|P| P.borrow().0));
+        let extended_points = points.into_iter().map(|opt_P| opt_P.map(|P| P.0));
 
         EdwardsPoint::optional_multiscalar_mul(scalars, extended_points).map(RistrettoPoint)
     }
diff --git a/ed25519-dalek/Cargo.toml b/ed25519-dalek/Cargo.toml
index 2064d39..711f91c 100644
--- a/ed25519-dalek/Cargo.toml
+++ b/ed25519-dalek/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ed25519-dalek"
-version = "2.0.0-rc.3"
+version = "2.0.0"
 edition = "2021"
 authors = [
     "isis lovecruft <isis@patternsinthevoid.net>",
diff --git a/ed25519-dalek/README.md b/ed25519-dalek/README.md
index 5e14653..7524395 100644
--- a/ed25519-dalek/README.md
+++ b/ed25519-dalek/README.md
@@ -5,20 +5,10 @@ verification.
 
 # Use
 
-## Stable
-
 To import `ed25519-dalek`, add the following to the dependencies section of
 your project's `Cargo.toml`:
 ```toml
-ed25519-dalek = "1"
-```
-
-## Beta
-
-To use the latest prerelease (see changes [below](#breaking-changes-in-200)),
-use the following line in your project's `Cargo.toml`:
-```toml
-ed25519-dalek = "2.0.0-rc.3"
+ed25519-dalek = "2"
 ```
 
 # Feature Flags