chore: use resolver 2 and 2021 edition (#769)

fluencelabs · Dec 18, 2023 · 0a8827b · 0a8827b
1 parent 771d42d
commit 0a8827b
Show file tree

Hide file tree

Showing 39 changed files with 38 additions and 56 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "air",
     "air-interpreter",

diff --git a/air-interpreter/Cargo.toml b/air-interpreter/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-interpreter"
 version = "0.55.0"
 description = "Crate-wrapper for air"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 publish = false
 keywords = ["fluence", "air", "webassembly", "programming-language"]
 categories = ["wasm"]

diff --git a/air/Cargo.toml b/air/Cargo.toml
@@ -3,7 +3,7 @@ name = "aquavm-air"
 version = "0.55.0"
 description = "Interpreter of AIR scripts intended to coordinate request flow in the Fluence network"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/fluencelabs/aquavm"
 documentation = "https://docs.rs/aquavm-air"

diff --git a/air/src/execution_step/lambda_applier/applier.rs b/air/src/execution_step/lambda_applier/applier.rs
@@ -33,7 +33,6 @@ use air_lambda_parser::ValueAccessor;
 use non_empty_vec::NonEmpty;
 
 use std::borrow::Cow;
-use std::convert::TryFrom;
 use std::ops::Deref;
 use std::rc::Rc;
 

diff --git a/air/src/execution_step/lambda_applier/utils.rs b/air/src/execution_step/lambda_applier/utils.rs
@@ -125,8 +125,6 @@ fn try_jvalue_as_idx(jvalue: &JValue) -> LambdaResult<u32> {
 }
 
 fn try_number_to_u32(accessor: &serde_json::Number) -> LambdaResult<u32> {
-    use std::convert::TryFrom;
-
     accessor
         .as_u64()
         .and_then(|v| u32::try_from(v).ok())

diff --git a/air/src/execution_step/mod.rs b/air/src/execution_step/mod.rs
@@ -34,7 +34,6 @@ pub use lambda_applier::LambdaError;
 
 pub mod errors_prelude {
     pub use super::CatchableError;
-    pub use super::ExecutionError;
     pub use super::UncatchableError;
 }
 

diff --git a/air/src/execution_step/value_types/stream/stream_definition.rs b/air/src/execution_step/value_types/stream/stream_definition.rs
@@ -171,17 +171,13 @@ pub enum Generation {
 impl Generation {
     #[cfg(test)]
     pub fn previous(generation_id: u32) -> Self {
-        use std::convert::TryFrom;
-
         let generation_id = usize::try_from(generation_id).unwrap();
         let generation_idx = GenerationIdx::from(generation_id);
         Self::Previous(generation_idx)
     }
 
     #[cfg(test)]
     pub fn current(generation_id: u32) -> Self {
-        use std::convert::TryFrom;
-
         let generation_id = usize::try_from(generation_id).unwrap();
         let generation_idx = GenerationIdx::from(generation_id);
         Self::Current(generation_idx)

diff --git a/air/src/lib.rs b/air/src/lib.rs
@@ -45,6 +45,9 @@ pub use execution_step::execution_context::no_error;
 pub use execution_step::execution_context::no_error_object;
 pub use execution_step::execution_context::ExecutionCidState;
 pub use execution_step::execution_context::InstructionError;
+pub use execution_step::execution_context::ERROR_CODE_FIELD_NAME;
+pub use execution_step::execution_context::INSTRUCTION_FIELD_NAME;
+pub use execution_step::execution_context::MESSAGE_FIELD_NAME;
 pub use execution_step::execution_context::NO_ERROR_ERROR_CODE;
 pub use execution_step::execution_context::NO_ERROR_MESSAGE;
 pub use execution_step::CatchableError;

diff --git a/air/src/preparation_step/preparation.rs b/air/src/preparation_step/preparation.rs
@@ -33,8 +33,6 @@ use air_parser::ast::Instruction;
 use air_utils::measure;
 use fluence_keypair::KeyFormat;
 
-use std::convert::TryFrom;
-
 type PreparationResult<T> = Result<T, PreparationError>;
 
 /// Represents result of the preparation_step step.

diff --git a/air/tests/test_module/features/tetraplets/security_tetraplets/auth_module/Cargo.lock b/air/tests/test_module/features/tetraplets/security_tetraplets/auth_module/Cargo.lock
diff --git a/air/tests/test_module/features/tetraplets/security_tetraplets/auth_module/Cargo.toml b/air/tests/test_module/features/tetraplets/security_tetraplets/auth_module/Cargo.toml
@@ -2,7 +2,7 @@
 name = "auth_module"
 version = "0.1.0"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "auth_module"

diff --git a/air/tests/test_module/features/tetraplets/security_tetraplets/log_storage/Cargo.toml b/air/tests/test_module/features/tetraplets/security_tetraplets/log_storage/Cargo.toml
@@ -2,7 +2,7 @@
 name = "log_storage"
 version = "0.1.0"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "log_storage"

diff --git a/air/tests/test_module/issues/issue_178.rs b/air/tests/test_module/issues/issue_178.rs
@@ -52,7 +52,7 @@ fn par_ap_behaviour() {
     let client_result_1 = engine.execute_one(client_name).unwrap();
     assert_next_pks!(
         &client_result_1.next_peer_pks,
-        [relay_id.as_str(), variable_setter_id.as_str()]
+        &[relay_id.as_str(), variable_setter_id.as_str()]
     );
 
     let setter_result = engine.execute_one(variable_setter_name).unwrap();

diff --git a/avm/interface/Cargo.toml b/avm/interface/Cargo.toml
@@ -3,7 +3,7 @@ name = "avm-interface"
 description = "Fluence AIR VM interfacing"
 version = "0.29.3"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 documentation = "https://docs.rs/avm-interface"
 repository = "https://github.com/fluencelabs/aquavm/tree/master/avm/interface"

diff --git a/avm/server/Cargo.toml b/avm/server/Cargo.toml
@@ -3,7 +3,7 @@ name = "avm-server"
 description = "Fluence AIR VM"
 version = "0.33.4"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 documentation = "https://docs.rs/avm-server"
 repository = "https://github.com/fluencelabs/aquavm/tree/master/avm/server"

diff --git a/crates/air-lib/air-parser/Cargo.toml b/crates/air-lib/air-parser/Cargo.toml
@@ -3,7 +3,7 @@ name = "aquavm-air-parser"
 description = "Parser of the AIR scripts in a form of string to AST"
 version = "0.11.0"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 documentation = "https://docs.rs/air-parser"
 repository = "https://github.com/fluencelabs/aquavm"

diff --git a/crates/air-lib/execution-info-collector/Cargo.toml b/crates/air-lib/execution-info-collector/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-execution-info-collector"
 version = "0.7.11"
 description = "Implementation of AIR execution info collector"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/fluencelabs/aquavm"
 documentation = "https://docs.rs/air-execution-info-collector"

diff --git a/crates/air-lib/interpreter-cid/Cargo.toml b/crates/air-lib/interpreter-cid/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-interpreter-cid"
 description = "AIR interpreter CID util module"
 version = "0.7.0"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 documentation = "https://docs.rs/air-interpreter-cid"
 repository = "https://github.com/fluencelabs/aquavm/tree/master/crates/air-lib/interpreter-cid"

diff --git a/crates/air-lib/interpreter-data/Cargo.toml b/crates/air-lib/interpreter-data/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-interpreter-data"
 description = "Data format of the AIR interpreter"
 version = "0.15.0"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/fluencelabs/aquavm"
 documentation = "https://docs.rs/air-interpreter-data"

diff --git a/crates/air-lib/interpreter-data/src/trace_pos.rs b/crates/air-lib/interpreter-data/src/trace_pos.rs
@@ -21,8 +21,6 @@ use newtype_derive::*;
 use serde::Deserialize;
 use serde::Serialize;
 
-use std::convert::TryFrom;
-
 pub type PosType = u32;
 
 #[derive(Copy, Clone, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]

diff --git a/crates/air-lib/interpreter-interface/Cargo.toml b/crates/air-lib/interpreter-interface/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-interpreter-interface"
 description = "Interface of the AIR interpreter"
 version = "0.15.2"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 documentation = "https://docs.rs/air-interpreter-interface"
 repository = "https://github.com/fluencelabs/aquavm/tree/master/crates/air-lib/interpreter-interface"

diff --git a/crates/air-lib/interpreter-signatures/Cargo.toml b/crates/air-lib/interpreter-signatures/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-interpreter-signatures"
 description = "AIR interpreter signatures util module"
 version = "0.1.5"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 documentation = "https://docs.rs/air-interpreter-signatures"
 repository = "https://github.com/fluencelabs/aquavm/tree/master/crates/air-lib/interpreter-signatures"

diff --git a/crates/air-lib/interpreter-signatures/src/lib.rs b/crates/air-lib/interpreter-signatures/src/lib.rs
@@ -39,7 +39,6 @@ use borsh::BorshSerialize;
 use fluence_keypair::error::SigningError;
 use serde::{Deserialize, Serialize};
 
-use std::convert::TryFrom;
 use std::hash::Hash;
 use std::ops::Deref;
 

diff --git a/crates/air-lib/lambda/ast/Cargo.toml b/crates/air-lib/lambda/ast/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-lambda-ast"
 description = "Definition of the AIR lambda AST"
 version = "0.1.0"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/fluencelabs/aquavm"
 documentation = "https://docs.rs/air-lambda-ast"

diff --git a/crates/air-lib/lambda/ast/src/ast/impls.rs b/crates/air-lib/lambda/ast/src/ast/impls.rs
@@ -21,8 +21,6 @@ use crate::ValueAccessor;
 pub use non_empty_vec::EmptyError;
 use non_empty_vec::NonEmpty;
 
-use std::convert::TryFrom;
-
 impl<'input> LambdaAST<'input> {
     pub fn try_from_accessors(accessors: Vec<ValueAccessor<'input>>) -> Result<Self, EmptyError> {
         let value_path = NonEmpty::try_from(accessors)?;

diff --git a/crates/air-lib/lambda/parser/Cargo.toml b/crates/air-lib/lambda/parser/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-lambda-parser"
 description = "Parser of an AIR lambda"
 version = "0.1.0"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/fluencelabs/aquavm"
 documentation = "https://docs.rs/air-lambda-parser"

diff --git a/crates/air-lib/lambda/parser/src/parser/lambda_parser.rs b/crates/air-lib/lambda/parser/src/parser/lambda_parser.rs
@@ -22,9 +22,6 @@ use crate::Functor;
 use crate::LambdaAST;
 use crate::ValueAccessor;
 
-use std::convert::TryFrom;
-use std::convert::TryInto;
-
 // Caching parser to cache internal regexes, which are expensive to instantiate
 // See also https://github.com/lalrpop/lalrpop/issues/269
 thread_local!(static PARSER: RawLambdaASTParser = RawLambdaASTParser::new());

diff --git a/crates/air-lib/log-targets/Cargo.toml b/crates/air-lib/log-targets/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-log-targets"
 version = "0.1.0"
 description = "Definition of global consts used for logging"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/fluencelabs/aquavm"
 documentation = "https://docs.rs/air-log-targets"

diff --git a/crates/air-lib/polyplets/Cargo.toml b/crates/air-lib/polyplets/Cargo.toml
@@ -3,7 +3,7 @@ name = "polyplets"
 version = "0.5.1"
 description = "Security primitives to verify origin of service calls in Fluence network"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 documentation = "https://docs.rs/polyplets"
 repository = "https://github.com/fluencelabs/aquavm/tree/master/crates/air-lib/polyplets"

diff --git a/crates/air-lib/test-utils/Cargo.toml b/crates/air-lib/test-utils/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-test-utils"
 version = "0.13.0"
 description = "Test utils for the AIR interpreter"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/fluencelabs/aquavm"
 documentation = "https://docs.rs/air-test-utils"

diff --git a/crates/air-lib/test-utils/src/key_utils.rs b/crates/air-lib/test-utils/src/key_utils.rs
@@ -25,7 +25,6 @@ use rand_chacha::rand_core::SeedableRng;
 // Should be moved to test lib when keypair interface PR is merged.
 pub fn derive_dummy_keypair(seed: &str) -> (KeyPair, String) {
     use sha2::{Digest as _, Sha256};
-    use std::convert::TryFrom;
 
     let mut rng = {
         let mut hasher = Sha256::new();

diff --git a/crates/air-lib/test-utils/src/lib.rs b/crates/air-lib/test-utils/src/lib.rs
@@ -47,9 +47,6 @@ pub mod prelude {
     pub use executed_state::*;
     pub use test_runner::*;
 
-    pub use air::interpreter_data::*;
-    pub use avm_server::*;
-
     pub use serde_json::json;
 }
 
@@ -132,7 +129,7 @@ macro_rules! assert_next_pks {
     ($expected:expr, $actual:expr) => {
         let expected: std::collections::HashSet<_> =
             $expected.into_iter().map(|s| s.as_str()).collect();
-        let actual: std::collections::HashSet<_> = $actual.into_iter().map(|s| *s).collect();
+        let actual: std::collections::HashSet<_> = $actual.iter().map(|s| *s).collect();
 
         assert_eq!(expected, actual)
     };

diff --git a/crates/air-lib/trace-handler/Cargo.toml b/crates/air-lib/trace-handler/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-trace-handler"
 version = "0.5.8"
 description = "Implementation of AIR trace handler"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 keywords = ["fluence", "air", "webassembly", "programming-language"]
 categories = ["wasm"]

diff --git a/crates/air-lib/utils/Cargo.toml b/crates/air-lib/utils/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-utils"
 version = "0.2.0"
 description = "AIR helper funcitions and macros"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 keywords = ["fluence", "air", "webassembly", "programming-language"]
 categories = ["wasm"]

diff --git a/crates/beautifier/Cargo.toml b/crates/beautifier/Cargo.toml
@@ -3,7 +3,7 @@ name = "air-beautifier"
 version = "0.4.0"
 description = "AIR human-readable format transformer library"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/fluencelabs/aquavm"
 documentation = "https://docs.rs/air-beautifier"

diff --git a/crates/data-store/Cargo.toml b/crates/data-store/Cargo.toml
@@ -3,7 +3,7 @@ name = "avm-data-store"
 version = "0.7.3"
 description = "Definition of the AVM DataStore trait"
 authors = ["Fluence Labs"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 documentation = "https://docs.rs/avm-data-store"
 repository = "https://github.com/fluencelabs/aquavm/tree/master/crates/data-store"