migration to edition 2021, plus fix compile errors

Dushistov · Nov 11, 2024 · 1043c30 · 1043c30
1 parent 257b9b4
commit 1043c30
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/android-example/Cargo.toml b/android-example/Cargo.toml
@@ -3,7 +3,7 @@ name = "flapigen-android-example"
 version = "0.0.1"
 authors = ["Evgeniy A. Dushistov <[email protected]>"]
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "mobcore"

diff --git a/android-example/src/lib.rs b/android-example/src/lib.rs
@@ -12,7 +12,7 @@ impl Session {
         #[cfg(target_os = "android")]
         android_logger::init_once(
             android_logger::Config::default()
-                .with_min_level(log::Level::Debug)
+                .with_max_level(log::LevelFilter::Debug)
                 .with_tag("Hello"),
         );
         log_panics::init(); // log panics rather than printing them

diff --git a/android-tests/Cargo.toml b/android-tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "flapigen-android-tests"
 version = "0.0.1"
 authors = ["Evgeniy A. Dushistov <[email protected]>"]
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "mobcore"

diff --git a/android-tests/src/lib.rs b/android-tests/src/lib.rs
@@ -16,7 +16,7 @@ impl Session {
         #[cfg(target_os = "android")]
         android_logger::init_once(
             android_logger::Config::default()
-                .with_min_level(log::Level::Debug)
+                .with_max_level(log::LevelFilter::Debug)
                 .with_tag("Hello"),
         );
         log_panics::init(); // log panics rather than printing them

diff --git a/cpp-example/rust-part/Cargo.toml b/cpp-example/rust-part/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cpp-example-rust-part"
 version = "0.1.0"
 authors = ["Evgeniy A. Dushistov <[email protected]>"]
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 
 # ANCHOR: cargo_lib_section

diff --git a/cpp_tests/Cargo.toml b/cpp_tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "flapigen_test_cpp"
 version = "0.1.0"
 authors = ["Evgeniy A. Dushistov <[email protected]>"]
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "flapigen_test"

diff --git a/cpp_tests/src/cpp_glue.rs.in b/cpp_tests/src/cpp_glue.rs.in
@@ -1012,6 +1012,7 @@ foreign_typemap!(
     ($p:r_type) <T> impl FnOnce(T) <= CFnOnce!()
     {
         $out_no_type = move |x| {
+            let _ = & $p;
             swig_from_rust_to_i_type!(T, x, x)
             ($p.cb)(x, $p.ctx);
         };

diff --git a/debug-util/Cargo.toml b/debug-util/Cargo.toml
@@ -2,7 +2,7 @@
 name = "debug-util"
 version = "0.1.0"
 authors = ["Evgeniy A. Dushistov <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 env_logger = "0.11.3"

diff --git a/jni_tests/Cargo.toml b/jni_tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "flapigen_test_jni"
 version = "0.1.0"
 authors = ["Evgeniy A. Dushistov <[email protected]>"]
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "flapigen_test_jni"

diff --git a/python_tests/Cargo.toml b/python_tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "flapigen_test_python"
 version = "0.1.0"
 authors = ["Adam Rzepka <[email protected]>"]
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "flapigen_test_python"