From 0a8827bb3c3439d53e44080a92da3caf8ab45a47 Mon Sep 17 00:00:00 2001 From: Mike Voronov Date: Mon, 18 Dec 2023 18:48:46 +0300 Subject: [PATCH] chore: use resolver 2 and 2021 edition (#769) --- Cargo.toml | 1 + air-interpreter/Cargo.toml | 2 +- air/Cargo.toml | 2 +- air/src/execution_step/lambda_applier/applier.rs | 1 - air/src/execution_step/lambda_applier/utils.rs | 2 -- air/src/execution_step/mod.rs | 1 - .../value_types/stream/stream_definition.rs | 4 ---- air/src/lib.rs | 3 +++ air/src/preparation_step/preparation.rs | 2 -- .../security_tetraplets/auth_module/Cargo.lock | 16 ++++++++-------- .../security_tetraplets/auth_module/Cargo.toml | 2 +- .../security_tetraplets/log_storage/Cargo.toml | 2 +- air/tests/test_module/issues/issue_178.rs | 2 +- avm/interface/Cargo.toml | 2 +- avm/server/Cargo.toml | 2 +- crates/air-lib/air-parser/Cargo.toml | 2 +- .../air-lib/execution-info-collector/Cargo.toml | 2 +- crates/air-lib/interpreter-cid/Cargo.toml | 2 +- crates/air-lib/interpreter-data/Cargo.toml | 2 +- crates/air-lib/interpreter-data/src/trace_pos.rs | 2 -- crates/air-lib/interpreter-interface/Cargo.toml | 2 +- crates/air-lib/interpreter-signatures/Cargo.toml | 2 +- crates/air-lib/interpreter-signatures/src/lib.rs | 1 - crates/air-lib/lambda/ast/Cargo.toml | 2 +- crates/air-lib/lambda/ast/src/ast/impls.rs | 2 -- crates/air-lib/lambda/parser/Cargo.toml | 2 +- .../lambda/parser/src/parser/lambda_parser.rs | 3 --- crates/air-lib/log-targets/Cargo.toml | 2 +- crates/air-lib/polyplets/Cargo.toml | 2 +- crates/air-lib/test-utils/Cargo.toml | 2 +- crates/air-lib/test-utils/src/key_utils.rs | 1 - crates/air-lib/test-utils/src/lib.rs | 5 +---- crates/air-lib/trace-handler/Cargo.toml | 2 +- crates/air-lib/utils/Cargo.toml | 2 +- crates/beautifier/Cargo.toml | 2 +- crates/data-store/Cargo.toml | 2 +- crates/interpreter-wasm/Cargo.toml | 2 +- crates/testing-framework/Cargo.toml | 2 +- tools/wasm/air-near-contract/Cargo.toml | 2 +- 39 files changed, 38 insertions(+), 56 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 04d9ff1c99..36123a4d91 100644 --- 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 index b5ce46cae6..1cc8f9d554 100644 --- 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 index 8466136b59..c82e7b0626 100644 --- 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 index 83f18e9ead..ce9c7da99c 100644 --- 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 index 37fb7ce171..8a656a9431 100644 --- 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 { } fn try_number_to_u32(accessor: &serde_json::Number) -> LambdaResult { - 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 index b1742c7167..9a126f4e09 100644 --- 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 index b0d9961305..94e15f8165 100644 --- a/air/src/execution_step/value_types/stream/stream_definition.rs +++ b/air/src/execution_step/value_types/stream/stream_definition.rs @@ -171,8 +171,6 @@ 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) @@ -180,8 +178,6 @@ impl Generation { #[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 index 289437a169..9be4b883de 100644 --- 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 index 7eb28f870b..cea0be7df4 100644 --- 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 = Result; /// 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 index f56a467151..13fc7d3e27 100644 --- 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 @@ -24,14 +24,14 @@ dependencies = [ [[package]] name = "air-execution-info-collector" -version = "0.7.10" +version = "0.7.11" dependencies = [ "aquavm-air-parser", ] [[package]] name = "air-interpreter-cid" -version = "0.6.0" +version = "0.7.0" dependencies = [ "blake3", "cid", @@ -46,7 +46,7 @@ dependencies = [ [[package]] name = "air-interpreter-data" -version = "0.14.0" +version = "0.15.0" dependencies = [ "air-interpreter-cid", "air-interpreter-signatures", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "air-interpreter-interface" -version = "0.15.1" +version = "0.15.2" dependencies = [ "serde", "serde_json", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "air-interpreter-signatures" -version = "0.1.4" +version = "0.1.5" dependencies = [ "air-interpreter-cid", "borsh", @@ -113,7 +113,7 @@ version = "0.1.0" [[package]] name = "air-trace-handler" -version = "0.5.7" +version = "0.5.8" dependencies = [ "air-interpreter-cid", "air-interpreter-data", @@ -149,7 +149,7 @@ dependencies = [ [[package]] name = "aquavm-air" -version = "0.54.0" +version = "0.55.0" dependencies = [ "air-execution-info-collector", "air-interpreter-cid", @@ -181,7 +181,7 @@ dependencies = [ [[package]] name = "aquavm-air-parser" -version = "0.10.0" +version = "0.11.0" dependencies = [ "air-lambda-ast", "air-lambda-parser", 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 index 25303340f9..fea611727c 100644 --- 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 index 084913a5e5..c9548d7d5e 100644 --- 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 index 3413688438..8939d22445 100644 --- 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 index ff665c4099..6d1583d7ff 100644 --- 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 index c0f45834f7..e4447c0086 100644 --- 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 index f4ff1b8ca3..3c948f41da 100644 --- 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 index 52b171ef17..69a8cab8dd 100644 --- 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 index 43df001b00..9667e3aacf 100644 --- 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 index 3c0a98aeb9..9a4a3233d9 100644 --- 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 index bdc4505177..32272a6da2 100644 --- 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 index 50b43d45c0..fb7b9a6e0e 100644 --- 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 index 6cbb0aaf15..f228541a5c 100644 --- 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 index 9d4874b2e2..12ee6c18aa 100644 --- 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 index 6173a53e22..fb98c7fef6 100644 --- 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 index 5778723447..c8ff837422 100644 --- 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>) -> Result { 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 index 3817fe9fb6..1acd73b9ba 100644 --- 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 index 75cae7fcc3..91f8eb01a9 100644 --- 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 index 4e8b816114..31a496397a 100644 --- 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 index 89eb7e01fd..c1c750be93 100644 --- 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 index a613595007..ff296b0ade 100644 --- 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 index 9c1600f2b2..5084f5b141 100644 --- 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 index 01f10fb317..d84b06f983 100644 --- 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 index b5fc28e3d8..d531e68b3b 100644 --- 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 index d4ac869d58..d0f59a0094 100644 --- 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 index db05c55382..f954f250f8 100644 --- 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 index 2755e5d6fc..1840966003 100644 --- 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" diff --git a/crates/interpreter-wasm/Cargo.toml b/crates/interpreter-wasm/Cargo.toml index e0d44a2ff4..8432feae9a 100644 --- a/crates/interpreter-wasm/Cargo.toml +++ b/crates/interpreter-wasm/Cargo.toml @@ -4,7 +4,7 @@ version = "0.55.0" description = "Distribution of AIR interpreter as .wasm" authors = ["Fluence Labs"] license = "Apache-2.0" -edition = "2018" +edition = "2021" include = [ "**/*.rs", "Cargo.toml", diff --git a/crates/testing-framework/Cargo.toml b/crates/testing-framework/Cargo.toml index 2619849c09..fd8995ca4c 100644 --- a/crates/testing-framework/Cargo.toml +++ b/crates/testing-framework/Cargo.toml @@ -3,7 +3,7 @@ name = "air-testing-framework" version = "0.8.0" description = "AquaVM testing framework" authors = ["Fluence Labs"] -edition = "2018" +edition = "2021" license = "Apache-2.0" repository = "https://github.com/fluencelabs/aquavm/tree/master/crates/test-framework" documentation = "https://docs.rs/air-testing-framework" diff --git a/tools/wasm/air-near-contract/Cargo.toml b/tools/wasm/air-near-contract/Cargo.toml index 27291e9023..349cc263d5 100644 --- a/tools/wasm/air-near-contract/Cargo.toml +++ b/tools/wasm/air-near-contract/Cargo.toml @@ -3,7 +3,7 @@ name = "air-near-contract" version = "0.55.0" description = "AIR interpreter as a NEAR contract" authors = ["Fluence labs"] -edition = "2018" +edition = "2021" license = "Apache-2.0" keywords = ["fluence", "air", "webassembly", "programming-language", "near"] categories = ["wasm"]