bump edition to 2024

Author: baloo

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       matrix:
         target:
-          - wasm32-wasi
+          - wasm32-wasip1
 
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -9,8 +9,8 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Jack Grigg <[email protected]>"]
-edition = "2021"
-rust-version = "1.65"
+edition = "2024"
+rust-version = "1.85"
 repository = "https://github.com/str4d/rage"
 license = "MIT OR Apache-2.0"
 

age-core/src/format.rs

@@ -1,9 +1,10 @@
 //! Core types and encoding operations used by the age file format.
 
-use base64::{prelude::BASE64_STANDARD_NO_PAD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD_NO_PAD};
 use rand::{
+    RngCore,
     distr::{Distribution, Uniform},
-    rng, RngCore,
+    rng,
 };
 use secrecy::{ExposeSecret, ExposeSecretMut, SecretBox};
 
@@ -61,7 +62,7 @@ pub struct AgeStanza<'a> {
     body: Vec<&'a [u8]>,
 }
 
-impl<'a> AgeStanza<'a> {
+impl AgeStanza<'_> {
     /// Decodes and returns the body of this stanza.
     pub fn body(&self) -> Vec<u8> {
         // An AgeStanza will always contain at least one chunk.
@@ -158,13 +159,13 @@ pub fn grease_the_joint() -> Stanza {
 /// Decoding operations for age types.
 pub mod read {
     use nom::{
+        IResult,
         branch::alt,
-        bytes::streaming::{tag, take_while1, take_while_m_n},
+        bytes::streaming::{tag, take_while_m_n, take_while1},
         character::streaming::newline,
         combinator::{map, map_opt, opt, verify},
         multi::{many_till, separated_list1},
         sequence::{pair, preceded, terminated},
-        IResult,
     };
 
     use super::{AgeStanza, STANZA_TAG};
@@ -351,12 +352,12 @@ pub mod read {
 
 /// Encoding operations for age types.
 pub mod write {
-    use base64::{prelude::BASE64_STANDARD_NO_PAD, Engine};
+    use base64::{Engine, prelude::BASE64_STANDARD_NO_PAD};
     use cookie_factory::{
+        SerializeFn, WriteContext,
         combinator::string,
         multi::separated_list,
         sequence::{pair, tuple},
-        SerializeFn, WriteContext,
     };
     use std::io::Write;
     use std::iter;
@@ -405,7 +406,7 @@ pub mod write {
 
 #[cfg(test)]
 mod tests {
-    use base64::{prelude::BASE64_STANDARD_NO_PAD, Engine};
+    use base64::{Engine, prelude::BASE64_STANDARD_NO_PAD};
     use nom::error::ErrorKind;
 
     use super::{read, write};

age-core/src/plugin.rs

@@ -3,7 +3,7 @@
 //! These are shared between the client implementation in the `age` crate, and the plugin
 //! implementations built around the `age-plugin` crate.
 
-use rand::{rng, Rng};
+use rand::{Rng, rng};
 use secrecy::zeroize::Zeroize;
 use std::env;
 use std::fmt;
@@ -13,7 +13,7 @@ use std::path::Path;
 use std::process::{ChildStdin, ChildStdout, Command, Stdio};
 
 use crate::{
-    format::{grease_the_joint, read, write, Stanza},
+    format::{Stanza, grease_the_joint, read, write},
     io::{DebugReader, DebugWriter},
 };
 
@@ -124,7 +124,7 @@ impl<R: Read, W: Write> Connection<R, W> {
         cookie_factory::gen_simple(write::age_stanza(command, metadata, data), &mut self.output)
             .map_err(|e| match e {
                 GenError::IoError(e) => e,
-                e => io::Error::new(io::ErrorKind::Other, format!("{}", e)),
+                e => io::Error::other(format!("{}", e)),
             })
             .and_then(|w| w.flush())
     }
@@ -174,7 +174,7 @@ impl<R: Read, W: Write> Connection<R, W> {
         Ok(stanza)
     }
 
-    fn grease_gun(&mut self) -> impl Iterator<Item = Stanza> {
+    fn grease_gun(&mut self) -> impl Iterator<Item = Stanza> + use<R, W> {
         // Add 5% grease
         let mut rng = rng();
         (0..2).filter_map(move |_| {
@@ -313,7 +313,7 @@ impl<R: Read, W: Write> Connection<R, W> {
 /// Grease is applied automatically.
 pub struct UnidirSend<'a, R: Read, W: Write>(&'a mut Connection<R, W>);
 
-impl<'a, R: Read, W: Write> UnidirSend<'a, R, W> {
+impl<R: Read, W: Write> UnidirSend<'_, R, W> {
     /// Send a command.
     pub fn send(&mut self, command: &str, metadata: &[&str], data: &[u8]) -> io::Result<()> {
         for grease in self.0.grease_gun() {
@@ -341,7 +341,7 @@ impl<'a, R: Read, W: Write> UnidirSend<'a, R, W> {
 /// Grease is applied automatically.
 pub struct BidirSend<'a, R: Read, W: Write>(&'a mut Connection<R, W>);
 
-impl<'a, R: Read, W: Write> BidirSend<'a, R, W> {
+impl<R: Read, W: Write> BidirSend<'_, R, W> {
     /// Send a command and receive a response.
     pub fn send(&mut self, command: &str, metadata: &[&str], data: &[u8]) -> Result<Stanza> {
         for grease in self.0.grease_gun() {
@@ -389,7 +389,7 @@ impl<'a, R: Read, W: Write> BidirSend<'a, R, W> {
 /// The possible replies to a bidirectional command.
 pub struct Reply<'a, R: Read, W: Write>(&'a mut Connection<R, W>);
 
-impl<'a, R: Read, W: Write> Reply<'a, R, W> {
+impl<R: Read, W: Write> Reply<'_, R, W> {
     /// Reply with `ok` and optional data.
     pub fn ok(self, data: Option<&[u8]>) -> Response {
         Response(

age-core/src/primitives.rs

@@ -1,8 +1,8 @@
 //! Primitive cryptographic operations used across various `age` components.
 
 use chacha20poly1305::{
-    aead::{self, array::typenum::Unsigned, Aead, AeadCore, KeyInit},
     ChaCha20Poly1305,
+    aead::{self, Aead, AeadCore, KeyInit, array::typenum::Unsigned},
 };
 use hkdf::Hkdf;
 use sha2::Sha256;

age-plugin/examples/age-plugin-unencrypted.rs

@@ -3,10 +3,11 @@ use age_core::{
     secrecy::ExposeSecret,
 };
 use age_plugin::{
+    Callbacks, PluginHandler,
     identity::{self, IdentityPluginV1},
     print_new_identity,
     recipient::{self, RecipientPluginV1},
-    run_state_machine, Callbacks, PluginHandler,
+    run_state_machine,
 };
 use clap::Parser;
 

age-plugin/src/identity.rs

@@ -5,7 +5,7 @@ use age_core::{
     plugin::{self, BidirSend, Connection},
     secrecy::{ExposeSecret, SecretString},
 };
-use base64::{prelude::BASE64_STANDARD_NO_PAD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD_NO_PAD};
 use bech32::FromBase32;
 
 use std::collections::HashMap;
@@ -74,7 +74,7 @@ impl IdentityPluginV1 for Infallible {
 /// The interface that age plugins can use to interact with an age implementation.
 struct BidirCallbacks<'a, 'b, R: io::Read, W: io::Write>(&'b mut BidirSend<'a, R, W>);
 
-impl<'a, 'b, R: io::Read, W: io::Write> Callbacks<Error> for BidirCallbacks<'a, 'b, R, W> {
+impl<R: io::Read, W: io::Write> Callbacks<Error> for BidirCallbacks<'_, '_, R, W> {
     /// Shows a message to the user.
     ///
     /// This can be used to prompt the user to take some physical action, such as

age-plugin/src/recipient.rs

@@ -1,11 +1,11 @@
 //! Recipient plugin helpers.
 
 use age_core::{
-    format::{is_arbitrary_string, FileKey, Stanza},
+    format::{FileKey, Stanza, is_arbitrary_string},
     plugin::{self, BidirSend, Connection},
     secrecy::SecretString,
 };
-use base64::{prelude::BASE64_STANDARD_NO_PAD, Engine};
+use base64::{Engine, prelude::BASE64_STANDARD_NO_PAD};
 use bech32::FromBase32;
 
 use std::collections::HashSet;
@@ -39,7 +39,7 @@ pub trait RecipientPluginV1 {
     ///
     /// Returns an error if the recipient is unknown or invalid.
     fn add_recipient(&mut self, index: usize, plugin_name: &str, bytes: &[u8])
-        -> Result<(), Error>;
+    -> Result<(), Error>;
 
     /// Stores an identity that the user would like to encrypt age files to.
     ///
@@ -126,7 +126,7 @@ impl RecipientPluginV1 for Infallible {
 /// The interface that age plugins can use to interact with an age implementation.
 struct BidirCallbacks<'a, 'b, R: io::Read, W: io::Write>(&'b mut BidirSend<'a, R, W>);
 
-impl<'a, 'b, R: io::Read, W: io::Write> Callbacks<Error> for BidirCallbacks<'a, 'b, R, W> {
+impl<R: io::Read, W: io::Write> Callbacks<Error> for BidirCallbacks<'_, '_, R, W> {
     /// Shows a message to the user.
     ///
     /// This can be used to prompt the user to take some physical action, such as

age/Cargo.toml

@@ -137,3 +137,6 @@ harness = false
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }

age/benches/parser.rs

@@ -1,5 +1,5 @@
-use age::{x25519, Decryptor, Encryptor};
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
+use age::{Decryptor, Encryptor, x25519};
+use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
 
 #[cfg(unix)]
 use pprof::criterion::{Output, PProfProfiler};