Clean up edition move & clippy warnings (#691)

tokio-rs · Jul 29, 2022 · b314e84 · b314e84
1 parent e744211
commit b314e84
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/prost-build/Cargo.toml b/prost-build/Cargo.toml
@@ -10,7 +10,8 @@ repository = "https://github.com/tokio-rs/prost"
 documentation = "https://docs.rs/prost-build"
 readme = "README.md"
 description = "A Protocol Buffers implementation for the Rust Language."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [features]
 default = []

diff --git a/prost-build/src/lib.rs b/prost-build/src/lib.rs
@@ -1,5 +1,5 @@
 #![doc(html_root_url = "https://docs.rs/prost-build/0.10.1")]
-#![allow(clippy::option_as_ref_deref)]
+#![allow(clippy::option_as_ref_deref, clippy::format_push_string)]
 
 //! `prost-build` compiles `.proto` files into Rust.
 //!

diff --git a/prost-derive/Cargo.toml b/prost-derive/Cargo.toml
@@ -10,7 +10,8 @@ repository = "https://github.com/tokio-rs/prost"
 documentation = "https://docs.rs/prost-derive"
 readme = "README.md"
 description = "A Protocol Buffers implementation for the Rust Language."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [lib]
 proc_macro = true

diff --git a/prost-types/Cargo.toml b/prost-types/Cargo.toml
@@ -10,7 +10,8 @@ repository = "https://github.com/tokio-rs/prost"
 documentation = "https://docs.rs/prost-types"
 readme = "README.md"
 description = "A Protocol Buffers implementation for the Rust Language."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [lib]
 doctest = false

diff --git a/prost-types/src/lib.rs b/prost-types/src/lib.rs
@@ -372,7 +372,7 @@ impl TryFrom<Timestamp> for std::time::SystemTime {
                 timestamp
                     .seconds
                     .checked_neg()
-                    .ok_or(TimestampError::OutOfSystemRange(timestamp.clone()))?
+                    .ok_or_else(|| TimestampError::OutOfSystemRange(timestamp.clone()))?
                     as u64,
             ))
         };