prepare for edition 2024

amqp-rs · Aug 19, 2024 · fbb273b · fbb273b
1 parent 69b4c2a
commit fbb273b
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,9 +15,9 @@ rust-version = "1.74.0"
 
 [features]
 default                   = ["rustls", "default-runtime"]
-default-runtime           = ["async-global-executor-trait", "async-reactor-trait"]
+default-runtime           = ["dep:async-global-executor-trait", "dep:async-reactor-trait"]
 codegen                   = ["codegen-internal", "amq-protocol/codegen"]
-codegen-internal          = ["amq-protocol-codegen", "serde_json"]
+codegen-internal          = ["dep:amq-protocol-codegen", "dep:serde_json"]
 native-tls                = ["amq-protocol/native-tls"]
 openssl                   = ["amq-protocol/openssl"]
 rustls                    = ["amq-protocol/rustls"]

diff --git a/examples/client-certificate.rs b/examples/client-certificate.rs
@@ -28,7 +28,7 @@ fn get_tls_config() -> OwnedTLSConfig {
 
 fn main() {
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        unsafe { std::env::set_var("RUST_LOG", "info") };
     }
 
     tracing_subscriber::fmt::init();

diff --git a/examples/connection.rs b/examples/connection.rs
@@ -6,7 +6,7 @@ use tracing::info;
 
 fn main() {
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        unsafe { std::env::set_var("RUST_LOG", "info") };
     }
 
     tracing_subscriber::fmt::init();

diff --git a/examples/consumer.rs b/examples/consumer.rs
@@ -4,7 +4,7 @@ use tracing::info;
 
 fn main() {
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        unsafe { std::env::set_var("RUST_LOG", "info") };
     }
 
     tracing_subscriber::fmt::init();

diff --git a/examples/print-topology.rs b/examples/print-topology.rs
@@ -8,7 +8,7 @@ use tracing::info;
 
 fn main() -> Result<()> {
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        unsafe { std::env::set_var("RUST_LOG", "info") };
     }
 
     tracing_subscriber::fmt::init();

diff --git a/examples/publisher_confirms.rs b/examples/publisher_confirms.rs
@@ -9,7 +9,7 @@ use tracing::info;
 
 fn main() {
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        unsafe { std::env::set_var("RUST_LOG", "info") };
     }
 
     tracing_subscriber::fmt::init();

diff --git a/examples/pubsub.rs b/examples/pubsub.rs
@@ -7,7 +7,7 @@ use tracing::info;
 
 fn main() -> Result<()> {
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        unsafe { std::env::set_var("RUST_LOG", "info") };
     }
 
     tracing_subscriber::fmt::init();

diff --git a/examples/reconnect.rs b/examples/reconnect.rs
@@ -76,7 +76,7 @@ async fn rabbit_stuff(addr: String) -> Result<()> {
 
 fn main() -> Result<()> {
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        unsafe { std::env::set_var("RUST_LOG", "info") };
     }
 
     tracing_subscriber::fmt::init();

diff --git a/examples/restore-topology.rs b/examples/restore-topology.rs
@@ -4,7 +4,7 @@ use tracing::info;
 
 fn main() -> Result<()> {
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        unsafe { std::env::set_var("RUST_LOG", "info") };
     }
 
     tracing_subscriber::fmt::init();

diff --git a/src/buffer.rs b/src/buffer.rs
@@ -222,7 +222,7 @@ impl BackToTheBuffer for &mut Buffer {
     >(
         s: WriteContext<Self>,
         reserved: usize,
-        gen: &Gen,
+        generator: &Gen,
         before: &Before,
     ) -> Result<WriteContext<Self>, GenError> {
         if s.write.available_space() < reserved {
@@ -232,7 +232,7 @@ impl BackToTheBuffer for &mut Buffer {
         }
         let start = s.write.checkpoint();
         s.write.fill(reserved);
-        gen(s).and_then(|(s, tmp)| {
+        generator(s).and_then(|(s, tmp)| {
             let mut end = s.write.checkpoint();
             end.backwards = false;
             s.write.rollback(start);

diff --git a/src/channel.rs b/src/channel.rs
@@ -618,7 +618,7 @@ impl Channel {
             }
         }
         if self.configuration.channel_max() == 0 {
-            self.configuration.set_channel_max(ChannelId::max_value());
+            self.configuration.set_channel_max(ChannelId::MAX);
         }
 
         if frame_max != 0 {
@@ -629,7 +629,7 @@ impl Channel {
             }
         }
         if self.configuration.frame_max() == 0 {
-            self.configuration.set_frame_max(FrameSize::max_value());
+            self.configuration.set_frame_max(FrameSize::MAX);
         }
     }
 

diff --git a/tests/connection.rs b/tests/connection.rs
@@ -43,7 +43,7 @@ impl ConsumerDelegate for Subscriber {
 #[test]
 fn connection() {
     if std::env::var("RUST_LOG").is_err() {
-        std::env::set_var("RUST_LOG", "info");
+        unsafe { std::env::set_var("RUST_LOG", "info") };
     }
 
     let _ = tracing_subscriber::fmt::try_init();