From 3c4b9dbb59d16cdc68ab9b57da67fe62748b89a9 Mon Sep 17 00:00:00 2001 From: Thibault Martinez Date: Tue, 2 Jul 2024 13:55:32 +0200 Subject: [PATCH 1/2] fix(iota): typos (#924) * fix: typos * Update external-crates/move/crates/move-package/src/resolution/dependency_graph.rs Co-authored-by: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com> * fmt * fmt external --------- Co-authored-by: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com> --- .../configs/webpack/webpack.config.common.ts | 4 +- .../accounts-finder/accounts-finder.ts | 2 +- .../src/background/storage-migration.ts | 2 +- .../pages/accounts/manage/AccountGroup.tsx | 2 +- crates/iota-bridge/src/iota_syncer.rs | 2 +- crates/iota-bridge/src/orchestrator.rs | 4 +- .../docs/iota-framework/kiosk.md | 2 +- .../iota-framework/sources/kiosk/kiosk.move | 2 +- .../move-stdlib/tests/vector_tests.move | 4 +- crates/iota-graphql-rpc/src/types/cursor.rs | 2 +- crates/iota-storage/src/indexes.rs | 2 +- crates/iota-storage/src/object_store/util.rs | 2 +- .../preview-effects/partials/Overview.tsx | 2 +- .../move-binary-format/src/check_bounds.rs | 2 +- .../move-binary-format/src/compatibility.rs | 2 +- .../src/dependency_graph.rs | 2 +- .../src/check_duplication.rs | 4 +- .../move/crates/move-cli/README.md | 48 +++--- .../move/crates/move-cli/src/sandbox/cli.rs | 2 +- .../move-cli/src/sandbox/commands/publish.rs | 2 +- .../migration/backup_sources/mod1.move | 2 +- .../migration/backup_sources/mod2.move | 2 +- .../migration/backup_sources/mod3_4.move | 2 +- .../migration/migration_sources/mod1.move | 2 +- .../migration/migration_sources/mod2.move | 2 +- .../migration/migration_sources/mod3_4.move | 2 +- .../migration/migration_tests/test0.move | 4 +- .../build_tests/migration/sources/mod1.move | 2 +- .../build_tests/migration/sources/mod2.move | 2 +- .../build_tests/migration/sources/mod3_4.move | 2 +- .../build_tests/migration/tests/test0.move | 4 +- .../src/command_line/compiler.rs | 2 +- .../move-compiler/src/expansion/translate.rs | 2 +- .../src/hlir/detect_dead_code.rs | 2 +- .../move-compiler/src/hlir/translate.rs | 2 +- .../crates/move-compiler/src/typing/core.rs | 2 +- .../receiving_non_object_type.exp | 2 +- .../macro_identifier_invalid_position.exp | 4 +- .../expansion/unnecessary_alias_implicit.exp | 10 +- .../expansion/unnecessary_alias_implicit.move | 4 +- .../move_2024/migration/let_mut_migrate.move | 2 +- .../index_call_constraints_unsatisfied.exp | 32 ++-- .../move_2024/typing/let_mut_assign.move | 2 +- .../move_2024/typing/let_mut_borrow_mut.move | 2 +- .../typing/let_mut_borrow_mut_dot_call.move | 2 +- .../macro_duck_typing_constraint_invalid.exp | 8 +- .../typing/macro_subst_tparams_invalid.exp | 28 ++-- ...cros_types_checked_invalid_constraints.exp | 14 +- ...pes_checked_invalid_constraints_simple.exp | 6 +- .../ability_constraint_generic_in_field.exp | 4 +- .../ability_constraint_prims_invalid.exp | 78 +++++----- .../ability_constraint_structs_invalid.exp | 84 +++++----- .../ability_constraint_tparams_invalid.exp | 84 +++++----- .../constraints_not_satisfied_all_cases.exp | 12 +- ...aints_not_satisfied_function_parameter.exp | 2 +- ...nts_not_satisfied_function_return_type.exp | 2 +- ...raints_not_satisfied_lvalues_bind_type.exp | 2 +- ...raints_not_satisfied_lvalues_decl_type.exp | 2 +- ...s_not_satisfied_lvalues_pack_type_args.exp | 4 +- ...constraints_not_satisfied_struct_field.exp | 2 +- ...straints_not_satisfied_type_annotation.exp | 2 +- ...satisfied_type_arguments_internal_call.exp | 2 +- ...satisfied_type_arguments_internal_pack.exp | 2 +- .../typing/instantiate_signatures.exp | 14 +- .../module_call_constraints_not_satisfied.exp | 42 ++--- ...odule_call_entry_function_was_invalid.move | 2 +- .../typing/pack_constraint_not_satisfied.exp | 18 +-- .../phantom_param_op_abilities_invalid.exp | 4 +- .../phantom_param_struct_decl_invalid.exp | 2 +- ...om_params_constraint_abilities_invalid.exp | 32 ++-- ...pe_variable_join_threaded_pack_invalid.exp | 2 +- ...le_join_threaded_unpack_assign_invalid.exp | 2 +- ..._variable_join_threaded_unpack_invalid.exp | 2 +- .../move/crates/move-coverage/src/summary.rs | 8 +- .../src/compilation/compiled_package.rs | 8 +- .../src/resolution/dependency_graph.rs | 2 +- .../Move.toml | 2 +- .../move-stdlib/tests/vector_tests.move | 4 +- .../src/tests/exec_func_effects_tests.rs | 4 +- .../move/crates/move-vm-runtime/src/loader.rs | 2 +- .../move-vm-types/src/natives/function.rs | 2 +- .../crates/test-generation/src/transitions.rs | 4 +- .../move/documentation/coding_guidelines.md | 145 +++++++++--------- .../src/check_duplication.rs | 4 +- .../v0/crates/move-vm-runtime/src/loader.rs | 2 +- .../src/programmable_transactions/context.rs | 2 +- .../programmable_transactions/execution.rs | 2 +- .../latest/iota-move-natives/src/lib.rs | 2 +- .../src/programmable_transactions/context.rs | 2 +- .../programmable_transactions/execution.rs | 2 +- .../v0/iota-move-natives/src/lib.rs | 2 +- scripts/rename-to-iota/rename.py | 2 +- sdk/bcs/CHANGELOG.md | 2 +- sdk/ledgerjs-hw-app-iota/CHANGELOG.md | 2 +- sdk/typescript/CHANGELOG.md | 8 +- .../__tests__/Transaction.test.ts | 2 +- sdk/wallet-standard/CHANGELOG.md | 2 +- 97 files changed, 439 insertions(+), 426 deletions(-) diff --git a/apps/wallet/configs/webpack/webpack.config.common.ts b/apps/wallet/configs/webpack/webpack.config.common.ts index 57c3c5c4a4c..4e59e3b9cde 100644 --- a/apps/wallet/configs/webpack/webpack.config.common.ts +++ b/apps/wallet/configs/webpack/webpack.config.common.ts @@ -33,7 +33,7 @@ function generateDateVersion(patch: number) { } const WALLET_BETA = process.env.WALLET_BETA === 'true'; -const PATCH_VERISON = Number(process.env.PATCH_VERSION) || 0; +const PATCH_VERSION = Number(process.env.PATCH_VERSION) || 0; const SDK_ROOT = resolve(__dirname, '..', '..', '..', '..', 'sdk'); const PROJECT_ROOT = resolve(__dirname, '..', '..'); @@ -99,7 +99,7 @@ async function generateAliasFromTs() { const commonConfig: () => Promise = async () => { const alias = await generateAliasFromTs(); - const walletVersionDetails = generateDateVersion(PATCH_VERISON); + const walletVersionDetails = generateDateVersion(PATCH_VERSION); const sentryAuthToken = process.env.SENTRY_AUTH_TOKEN; return { context: SRC_ROOT, diff --git a/apps/wallet/src/background/accounts-finder/accounts-finder.ts b/apps/wallet/src/background/accounts-finder/accounts-finder.ts index d523fe86773..7899b699194 100644 --- a/apps/wallet/src/background/accounts-finder/accounts-finder.ts +++ b/apps/wallet/src/background/accounts-finder/accounts-finder.ts @@ -31,7 +31,7 @@ export async function findAccounts( getBalance: GetBalanceCallback, gasTypeArg: string, ): Promise { - // TODO: first check that accounts: Account[] is correctly sorted, if not, throw exception or somethintg + // TODO: first check that accounts: Account[] is correctly sorted, if not, throw exception or something // Check new addresses for existing accounts if (addressGapLimit > 0) { for (const account of accounts) { diff --git a/apps/wallet/src/background/storage-migration.ts b/apps/wallet/src/background/storage-migration.ts index c5497cc95a9..a78813e380e 100644 --- a/apps/wallet/src/background/storage-migration.ts +++ b/apps/wallet/src/background/storage-migration.ts @@ -11,7 +11,7 @@ const MIGRATION_DONE_STORAGE_KEY = 'storage-migration-done'; let statusCache: Status | null = null; export async function getStatus() { - // placeholde for migration status, always returns ready + // placeholder for migration status, always returns ready if (statusCache) { return statusCache; } diff --git a/apps/wallet/src/ui/app/pages/accounts/manage/AccountGroup.tsx b/apps/wallet/src/ui/app/pages/accounts/manage/AccountGroup.tsx index 7df5077313c..403c85b4ae8 100644 --- a/apps/wallet/src/ui/app/pages/accounts/manage/AccountGroup.tsx +++ b/apps/wallet/src/ui/app/pages/accounts/manage/AccountGroup.tsx @@ -41,7 +41,7 @@ export function getGroupTitle(aGroupAccount: SerializedUIAccount) { return ACCOUNT_TYPE_TO_LABEL[aGroupAccount?.type] || ''; } -// todo: we probbaly have some duplication here with the various FooterLink / ButtonOrLink +// todo: we probably have some duplication here with the various FooterLink / ButtonOrLink // components - we should look to add these to base components somewhere const FooterLink = forwardRef( ({ children, to, ...props }, ref) => { diff --git a/crates/iota-bridge/src/iota_syncer.rs b/crates/iota-bridge/src/iota_syncer.rs index 73dd6ccdb89..4c4b8c47457 100644 --- a/crates/iota-bridge/src/iota_syncer.rs +++ b/crates/iota-bridge/src/iota_syncer.rs @@ -81,7 +81,7 @@ where async fn run_event_listening_task( // The module where interested events are defined. - // Moudle is always of bridge package 0x9. + // Module is always of bridge package 0x9. module: Identifier, mut cursor: EventID, events_sender: mysten_metrics::metered_channel::Sender<(Identifier, Vec)>, diff --git a/crates/iota-bridge/src/orchestrator.rs b/crates/iota-bridge/src/orchestrator.rs index 03755adb099..6b178ae217a 100644 --- a/crates/iota-bridge/src/orchestrator.rs +++ b/crates/iota-bridge/src/orchestrator.rs @@ -217,7 +217,7 @@ mod tests { #[tokio::test] async fn test_iota_watcher_task() { - // Note: this test may fail beacuse of the following reasons: + // Note: this test may fail because of the following reasons: // the IotaEvent's struct tag does not match the ones in events.rs let (iota_events_tx, iota_events_rx, _eth_events_tx, eth_events_rx, iota_client, store) = @@ -268,7 +268,7 @@ mod tests { #[tokio::test] async fn test_eth_watcher_task() { - // Note: this test may fail beacuse of the following reasons: + // Note: this test may fail because of the following reasons: // 1. Log and BridgeAction returned from `get_test_log_and_action` are not in // sync // 2. Log returned from `get_test_log_and_action` is not parseable log (not diff --git a/crates/iota-framework/docs/iota-framework/kiosk.md b/crates/iota-framework/docs/iota-framework/kiosk.md index 17d50068613..b4467450dae 100644 --- a/crates/iota-framework/docs/iota-framework/kiosk.md +++ b/crates/iota-framework/docs/iota-framework/kiosk.md @@ -276,7 +276,7 @@ A capability which locks an item and gives a permission to purchase it from a Kiosk for any price no less than min_price. Allows exclusive listing: only bearer of the PurchaseCap can -purchase the asset. However, the capablity should be used +purchase the asset. However, the capability should be used carefully as losing it would lock the asset in the Kiosk. The main application for the PurchaseCap is building extensions diff --git a/crates/iota-framework/packages/iota-framework/sources/kiosk/kiosk.move b/crates/iota-framework/packages/iota-framework/sources/kiosk/kiosk.move index 970dcf1dfb6..164d8c809a9 100644 --- a/crates/iota-framework/packages/iota-framework/sources/kiosk/kiosk.move +++ b/crates/iota-framework/packages/iota-framework/sources/kiosk/kiosk.move @@ -163,7 +163,7 @@ module iota::kiosk { /// purchase it from a `Kiosk` for any price no less than `min_price`. /// /// Allows exclusive listing: only bearer of the `PurchaseCap` can - /// purchase the asset. However, the capablity should be used + /// purchase the asset. However, the capability should be used /// carefully as losing it would lock the asset in the `Kiosk`. /// /// The main application for the `PurchaseCap` is building extensions diff --git a/crates/iota-framework/packages/move-stdlib/tests/vector_tests.move b/crates/iota-framework/packages/move-stdlib/tests/vector_tests.move index 4ff07ddd6c3..3c8b569fad5 100644 --- a/crates/iota-framework/packages/move-stdlib/tests/vector_tests.move +++ b/crates/iota-framework/packages/move-stdlib/tests/vector_tests.move @@ -433,9 +433,9 @@ module std::vector_tests { assert!(index == 1, 1); } - // index_of will return the index first occurence that is equal + // index_of will return the index first occurrence that is equal #[test] - fun index_of_nonempty_has_multiple_occurences() { + fun index_of_nonempty_has_multiple_occurrences() { let mut v = vector[]; v.push_back(false); v.push_back(true); diff --git a/crates/iota-graphql-rpc/src/types/cursor.rs b/crates/iota-graphql-rpc/src/types/cursor.rs index 8c2563651ac..c0477618d17 100644 --- a/crates/iota-graphql-rpc/src/types/cursor.rs +++ b/crates/iota-graphql-rpc/src/types/cursor.rs @@ -46,7 +46,7 @@ pub(crate) struct Page { /// In case there are more than `limit` entries in the range described by /// `(after, before)`, this field states whether the entries up to limit - /// are taken fron the `Front` or `Back` of that range. + /// are taken from the `Front` or `Back` of that range. end: End, } diff --git a/crates/iota-storage/src/indexes.rs b/crates/iota-storage/src/indexes.rs index cf35f38ac29..4d282b56cdd 100644 --- a/crates/iota-storage/src/indexes.rs +++ b/crates/iota-storage/src/indexes.rs @@ -407,7 +407,7 @@ impl IndexStore { }); let coin = obj.as_coin_maybe().unwrap_or_else(|| { panic!( - "object_id: {:?} in written_coins cannot be deserialzied as a Coin, written_coins: {:?}, tx_digest: {:?}", + "object_id: {:?} in written_coins cannot be deserialized as a Coin, written_coins: {:?}, tx_digest: {:?}", obj_id, written_coins, digest ) }); diff --git a/crates/iota-storage/src/object_store/util.rs b/crates/iota-storage/src/object_store/util.rs index e68c8dca3d7..622e462d464 100644 --- a/crates/iota-storage/src/object_store/util.rs +++ b/crates/iota-storage/src/object_store/util.rs @@ -377,7 +377,7 @@ pub fn get_path(prefix: &str) -> Path { } // Snapshot MANIFEST file is very simple. Just a newline delimited list of all -// paths in the snapshot directory this simplicty enables easy parsing for +// paths in the snapshot directory this simplicity enables easy parsing for // scripts to download snapshots pub async fn write_snapshot_manifest( dir: &Path, diff --git a/dapps/multisig-toolkit/src/components/preview-effects/partials/Overview.tsx b/dapps/multisig-toolkit/src/components/preview-effects/partials/Overview.tsx index a5ea23ed741..102e686d84b 100644 --- a/dapps/multisig-toolkit/src/components/preview-effects/partials/Overview.tsx +++ b/dapps/multisig-toolkit/src/components/preview-effects/partials/Overview.tsx @@ -28,7 +28,7 @@ export function Overview({ output }: { output: DryRunTransactionBlockResponse }) network, status: output.effects.status?.status === 'success' - ? '✅ Transaction dry run executed succesfully!' + ? '✅ Transaction dry run executed successfully!' : output.effects.status?.status === 'failure' ? '❌ Transaction failed to execute!' : null, diff --git a/external-crates/move/crates/move-binary-format/src/check_bounds.rs b/external-crates/move/crates/move-binary-format/src/check_bounds.rs index 61b7511207b..a416fbd5131 100644 --- a/external-crates/move/crates/move-binary-format/src/check_bounds.rs +++ b/external-crates/move/crates/move-binary-format/src/check_bounds.rs @@ -205,7 +205,7 @@ impl<'a> BoundsChecker<'a> { check_bounds_impl(self.view.identifiers(), function_handle.name)?; check_bounds_impl(self.view.signatures(), function_handle.parameters)?; check_bounds_impl(self.view.signatures(), function_handle.return_)?; - // function signature type paramters must be in bounds to the function type + // function signature type parameters must be in bounds to the function type // parameters let type_param_count = function_handle.type_parameters.len(); if let Some(sig) = self diff --git a/external-crates/move/crates/move-binary-format/src/compatibility.rs b/external-crates/move/crates/move-binary-format/src/compatibility.rs index 41e8842925e..0f728f238c1 100644 --- a/external-crates/move/crates/move-binary-format/src/compatibility.rs +++ b/external-crates/move/crates/move-binary-format/src/compatibility.rs @@ -332,7 +332,7 @@ fn type_parameter_phantom_decl_compatible( // phantom/non-phantom cannot change from one version to the next. old_type_parameter.is_phantom == new_type_parameter.is_phantom } else { - // old_type_paramter.is_phantom => new_type_parameter.is_phantom + // old_type_parameter.is_phantom => new_type_parameter.is_phantom !old_type_parameter.is_phantom || new_type_parameter.is_phantom } } diff --git a/external-crates/move/crates/move-bytecode-utils/src/dependency_graph.rs b/external-crates/move/crates/move-bytecode-utils/src/dependency_graph.rs index 13b3e57c673..0102aacb1a1 100644 --- a/external-crates/move/crates/move-bytecode-utils/src/dependency_graph.rs +++ b/external-crates/move/crates/move-bytecode-utils/src/dependency_graph.rs @@ -22,7 +22,7 @@ struct ModuleIndex(usize); impl<'a> DependencyGraph<'a> { /// Construct a dependency graph from a set of `modules`. /// Panics if `modules` contains duplicates or is not closed under the - /// depedency relation + /// dependency relation pub fn new(module_iter: impl IntoIterator) -> Self { let mut modules = vec![]; let mut reverse_modules = BTreeMap::new(); diff --git a/external-crates/move/crates/move-bytecode-verifier/src/check_duplication.rs b/external-crates/move/crates/move-bytecode-verifier/src/check_duplication.rs index 427dd3963b7..d4f6fac5b4a 100644 --- a/external-crates/move/crates/move-bytecode-verifier/src/check_duplication.rs +++ b/external-crates/move/crates/move-bytecode-verifier/src/check_duplication.rs @@ -51,7 +51,7 @@ impl<'a> DuplicationChecker<'a> { let checker = Self { module }; checker.check_field_handles()?; checker.check_field_instantiations()?; - checker.check_function_defintions()?; + checker.check_function_definitions()?; checker.check_struct_definitions()?; checker.check_struct_instantiations() } @@ -263,7 +263,7 @@ impl<'a> DuplicationChecker<'a> { Ok(()) } - fn check_function_defintions(&self) -> PartialVMResult<()> { + fn check_function_definitions(&self) -> PartialVMResult<()> { // FunctionDefinition - contained FunctionHandle defines uniqueness if let Some(idx) = Self::first_duplicate_element(self.module.function_defs().iter().map(|x| x.function)) diff --git a/external-crates/move/crates/move-cli/README.md b/external-crates/move/crates/move-cli/README.md index 7dae2bdb455..4ca15207445 100644 --- a/external-crates/move/crates/move-cli/README.md +++ b/external-crates/move/crates/move-cli/README.md @@ -4,17 +4,21 @@ The Move command-line interface (Move CLI) is a tool that provides an easy way t with writing and running Move code, and to experiment with developing new tools useful for Move development. To reflect this, the Move CLI commands are grouped into three main subcommands: -* **package commands**: are commands to create, compile, and test Move packages, as well as perform other operations related to packages. These do not rely on a Move Adapter implementation nor an implementation of storage. -* **sandbox commands**: are commands that allow you to write Move modules and scripts, write and run scripts and tests, and view the resulting state of execution in a local sandboxed environment. -* **experimental commands**: are experimental commands that are currently in development. + +- **package commands**: are commands to create, compile, and test Move packages, as well as perform other operations related to packages. These do not rely on a Move Adapter implementation nor an implementation of storage. +- **sandbox commands**: are commands that allow you to write Move modules and scripts, write and run scripts and tests, and view the resulting state of execution in a local sandboxed environment. +- **experimental commands**: are experimental commands that are currently in development. Every Move CLI command, with the exception of `package create`, is expected to be run within the context of a [Move package](https://move-language.github.io/move/packages.html). ## Installation + ```shell $ cargo install --path move/language/tools/move-cli ``` + or + ```shell $ cargo install --git https://github.com/move-language/move move-cli --branch main ``` @@ -37,7 +41,7 @@ USAGE: We'll go through the most common Move CLI commands and flags here, however you can find the complete list of commands available by calling `move ---help`. Additionally, the complete list of flags and options available +--help`. Additionally, the complete list of flags and options available for each Move CLI command can be found by passing the `--help` flag to it, i.e., `move --help`. @@ -47,12 +51,14 @@ Package commands provide wrappers with sane defaults around other commands that are provided either by various Move tools, compiler, or prover. The `move new` command will create a new empty Move package: + ```shell $ move new # Create a Move package under the current dir $ move new -p # Create a Move package under path ``` From within a package's root directory, you can build the modules and/or scripts that you have written in the package with: + ```shell $ move build # Builds the Move package you are currently in $ move build -p # Builds the Move package at @@ -85,6 +91,7 @@ You can also run unit tests in a package using the `test` command $ move test # Run Move unit tests in the current package $ move test -p # Run Move unit tests in the package at ``` + ## Sandbox Commands The sandbox allows you to experiment with writing and running Move code without @@ -147,11 +154,12 @@ single-`signer` script will trigger a type error. ### Passing arguments The CLI supports passing non-`signer` arguments to `move sandbox run` via `--args`. The following argument types are supported: -* `bool` literals (`true`, `false`) -* `u64` literals (e.g., `10`, `58`) -* `address` literals (e.g., `0x12`, `0x0000000000000000000000000000000f`) -* hexadecimal strings (e.g., `'x"0012"'` will parse as the `vector` value `[00, 12]`) -* ASCII strings (e.g., `'b"hi"'` will parse as the `vector` value `[68, 69]`) + +- `bool` literals (`true`, `false`) +- `u64` literals (e.g., `10`, `58`) +- `address` literals (e.g., `0x12`, `0x0000000000000000000000000000000f`) +- hexadecimal strings (e.g., `'x"0012"'` will parse as the `vector` value `[00, 12]`) +- ASCII strings (e.g., `'b"hi"'` will parse as the `vector` value `[68, 69]`) ### Publishing new modules @@ -355,7 +363,7 @@ key 0x2::Test::Resource { #### Cleaning state Since state persists from one call to the Move CLI to another, there will -frequently be times where you want to start again at a clean state. This +frequently be times where you want to start again at a clean state. This can be done using the `move sandbox clean` command which will remove the `storage` and `build` directories: @@ -456,6 +464,7 @@ Note: To view coverage information, the Move CLI must be installed with the `--d i.e., `cargo install --debug --path move/language/tools/move-cli`. Using our running example to illustrate: + ```shell $ move sandbox exp-test -p readme --track-cov 1 / 1 test(s) passed. @@ -476,7 +485,7 @@ Module 00000000000000000000000000000002::Test ``` The output indicates that not only the test is passed, but also that 100% -instruction coverage is observed in the `publish` funciton. This is expected +instruction coverage is observed in the `publish` function. This is expected as the whole purpose of our `test_script.move` is to run the `publish` function. At the same time, the other two functions, `unpublish` and `write`, are never executed, making the average coverage 27.78% for the whole `Test` module. @@ -503,11 +512,13 @@ fun test_unpublish_script(account: signer) { We further add a new command to the end of `args.txt` (`args.exp` needs to be updated too). + ```shell sandbox run sources/test_unpublish_script.move --signers 0xf -v ``` Now we can re-test the `readme` again + ```shell $ move sandbox exp-test -p readme --track-cov 1 / 1 test(s) passed. @@ -535,9 +546,9 @@ overall module coverage is boosted to 61.11%. The `move sandbox publish` command automatically detects when upgrading a module may lead to a breaking change. There are two kinds of breaking changes: -* Linking compatibility (e.g., removing or changing the signature of a public function that is invoked by other modules, removing a -struct or resource type used by other modules) -* Layout compatibility (e.g., adding/removing a resource or struct field) +- Linking compatibility (e.g., removing or changing the signature of a public function that is invoked by other modules, removing a + struct or resource type used by other modules) +- Layout compatibility (e.g., adding/removing a resource or struct field) The breaking changes analysis performed by `move sandbox publish` is necessarily conservative. For example, say we `move sandbox publish` the following module: @@ -570,7 +581,8 @@ Error: Layout API for structs of module 00000000000000000000000000000002::M has In this case, we know we have not published any instances of `S` in global storage, so it is safe to re-run `move sandbox publish --ignore-breaking-changes` (as recommended). We can double-check that this was not a breaking change by running `move sandbox doctor`. This handy command runs exhaustive sanity checks on global storage to detect any breaking changes that occurred in the past: -* All modules pass the bytecode verifier -* All modules link against their dependencies -* All resources deserialize according to their declared types -* All events deserialize according to their declared types + +- All modules pass the bytecode verifier +- All modules link against their dependencies +- All resources deserialize according to their declared types +- All events deserialize according to their declared types diff --git a/external-crates/move/crates/move-cli/src/sandbox/cli.rs b/external-crates/move/crates/move-cli/src/sandbox/cli.rs index eb169bbf5f2..41af0ba1edf 100644 --- a/external-crates/move/crates/move-cli/src/sandbox/cli.rs +++ b/external-crates/move/crates/move-cli/src/sandbox/cli.rs @@ -99,7 +99,7 @@ pub enum SandboxCommand { )] type_args: Vec, /// Maximum number of gas units to be consumed by execution. - /// When the budget is exhaused, execution will abort. + /// When the budget is exhausted, execution will abort. /// By default, no `gas-budget` is specified and gas metering is /// disabled. #[clap(long = "gas-budget", short = 'g')] diff --git a/external-crates/move/crates/move-cli/src/sandbox/commands/publish.rs b/external-crates/move/crates/move-cli/src/sandbox/commands/publish.rs index b02e4a2711f..9164f8bfd30 100644 --- a/external-crates/move/crates/move-cli/src/sandbox/commands/publish.rs +++ b/external-crates/move/crates/move-cli/src/sandbox/commands/publish.rs @@ -121,7 +121,7 @@ pub fn publish( if let Err(err) = res { println!("Invalid multi-module publishing: {}", err); if let Location::Module(module_id) = err.location() { - // find the module where error occures and explain + // find the module where error occurres and explain if let Some(unit) = modules_to_publish .into_iter() .find(|&x| x.unit.name().as_str() == module_id.name().as_str()) diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod1.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod1.move index 4d1a91ca01d..b5faeb0b843 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod1.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod1.move @@ -3,7 +3,7 @@ module A::mod1 { public fun t(x: u64, yip: u64, s: S): u64 { let yes = 0; let S { f: fin } = s; - // these four assignments necessiate mut annotations above + // these four assignments necessitate mut annotations above yip = 0; x = yes + 1; fin = fin + 1; diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod2.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod2.move index 83b28164367..e28c9e73272 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod2.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod2.move @@ -3,7 +3,7 @@ module A::mod2 { public fun t(x: u64, yip: u64, s: S): u64 { let yes = 0; let S { f: fin } = s; - // these four assignments necessiate mut annotations above + // these four assignments necessitate mut annotations above yip = 0; x = yes + 1; fin = fin + 1; diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod3_4.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod3_4.move index 44ecf45101a..1a884d48a67 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod3_4.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/backup_sources/mod3_4.move @@ -22,7 +22,7 @@ module A::mod4 { public fun t(x: u64, yip: u64, s: S): u64 { let yes = 0; let S { f: fin } = s; - // these four assignments necessiate mut annotations above + // these four assignments necessitate mut annotations above yip = 0; x = yes + 1; fin = fin + 1; diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod1.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod1.move index 58d7f7ba908..399dc0a6139 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod1.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod1.move @@ -3,7 +3,7 @@ module A::mod1 { public fun t(mut x: u64, mut yip: u64, s: S): u64 { let mut yes = 0; let S { f: mut fin } = s; - // these four assignments necessiate mut annotations above + // these four assignments necessitate mut annotations above yip = 0; x = yes + 1; fin = fin + 1; diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod2.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod2.move index 8927fcfd89c..9e7263c2d6b 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod2.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod2.move @@ -3,7 +3,7 @@ module A::mod2 { public fun t(mut x: u64, mut yip: u64, s: S): u64 { let mut yes = 0; let S { f: mut fin } = s; - // these four assignments necessiate mut annotations above + // these four assignments necessitate mut annotations above yip = 0; x = yes + 1; fin = fin + 1; diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod3_4.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod3_4.move index 562cf1cf3ee..cae4b891318 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod3_4.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_sources/mod3_4.move @@ -22,7 +22,7 @@ module A::mod4 { public fun t(mut x: u64, mut yip: u64, s: S): u64 { let mut yes = 0; let S { f: mut fin } = s; - // these four assignments necessiate mut annotations above + // these four assignments necessitate mut annotations above yip = 0; x = yes + 1; fin = fin + 1; diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_tests/test0.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_tests/test0.move index e910c153f72..c8518c74ef6 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_tests/test0.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/migration_tests/test0.move @@ -425,9 +425,9 @@ module A::vector_tests { assert!(index == 1, 1); } - // index_of will return the index first occurence that is equal + // index_of will return the index first occurrence that is equal #[test] - fun index_of_nonempty_has_multiple_occurences() { + fun index_of_nonempty_has_multiple_occurrences() { let mut v = V::empty(); V::push_back(&mut v, false); V::push_back(&mut v, true); diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod1.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod1.move index 4d1a91ca01d..b5faeb0b843 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod1.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod1.move @@ -3,7 +3,7 @@ module A::mod1 { public fun t(x: u64, yip: u64, s: S): u64 { let yes = 0; let S { f: fin } = s; - // these four assignments necessiate mut annotations above + // these four assignments necessitate mut annotations above yip = 0; x = yes + 1; fin = fin + 1; diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod2.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod2.move index 83b28164367..e28c9e73272 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod2.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod2.move @@ -3,7 +3,7 @@ module A::mod2 { public fun t(x: u64, yip: u64, s: S): u64 { let yes = 0; let S { f: fin } = s; - // these four assignments necessiate mut annotations above + // these four assignments necessitate mut annotations above yip = 0; x = yes + 1; fin = fin + 1; diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod3_4.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod3_4.move index 44ecf45101a..1a884d48a67 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod3_4.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/sources/mod3_4.move @@ -22,7 +22,7 @@ module A::mod4 { public fun t(x: u64, yip: u64, s: S): u64 { let yes = 0; let S { f: fin } = s; - // these four assignments necessiate mut annotations above + // these four assignments necessitate mut annotations above yip = 0; x = yes + 1; fin = fin + 1; diff --git a/external-crates/move/crates/move-cli/tests/build_tests/migration/tests/test0.move b/external-crates/move/crates/move-cli/tests/build_tests/migration/tests/test0.move index e3b67d8ea09..afa94b6d0eb 100644 --- a/external-crates/move/crates/move-cli/tests/build_tests/migration/tests/test0.move +++ b/external-crates/move/crates/move-cli/tests/build_tests/migration/tests/test0.move @@ -425,9 +425,9 @@ module A::vector_tests { assert!(index == 1, 1); } - // index_of will return the index first occurence that is equal + // index_of will return the index first occurrence that is equal #[test] - fun index_of_nonempty_has_multiple_occurences() { + fun index_of_nonempty_has_multiple_occurrences() { let v = V::empty(); V::push_back(&mut v, false); V::push_back(&mut v, true); diff --git a/external-crates/move/crates/move-compiler/src/command_line/compiler.rs b/external-crates/move/crates/move-compiler/src/command_line/compiler.rs index b6d9fd22116..023af308574 100644 --- a/external-crates/move/crates/move-compiler/src/command_line/compiler.rs +++ b/external-crates/move/crates/move-compiler/src/command_line/compiler.rs @@ -287,7 +287,7 @@ impl Compiler { /// canonicalized when converted to virtual file system paths /// and would show up as absolute in the test output /// which wouldn't be machine-agnostic. We need to relativize using - /// `vfs_root` beacuse it was also used during canonicalization + /// `vfs_root` because it was also used during canonicalization /// and might have altered path prefix in a non-standard way /// (e.g., this can happen on Windows). fn relativize_path(vsf_root: &VfsPath, path: Symbol) -> Symbol { diff --git a/external-crates/move/crates/move-compiler/src/expansion/translate.rs b/external-crates/move/crates/move-compiler/src/expansion/translate.rs index ef4eeb5d5da..ed6fb95fb42 100644 --- a/external-crates/move/crates/move-compiler/src/expansion/translate.rs +++ b/external-crates/move/crates/move-compiler/src/expansion/translate.rs @@ -4115,7 +4115,7 @@ fn check_restricted_name_all_cases( if Var::is_syntax_identifier_name(n.value) { let msg = format!( "Invalid {} name '{}'. Identifiers starting with '$' can be used only for \ - parameters and type paramters", + parameters and type parameters", case.name(), n, ); diff --git a/external-crates/move/crates/move-compiler/src/hlir/detect_dead_code.rs b/external-crates/move/crates/move-compiler/src/hlir/detect_dead_code.rs index 44965a7fcd1..1eb5f0f6cfc 100644 --- a/external-crates/move/crates/move-compiler/src/hlir/detect_dead_code.rs +++ b/external-crates/move/crates/move-compiler/src/hlir/detect_dead_code.rs @@ -25,7 +25,7 @@ use crate::{ // flow. It tracks control flow in a somewhat fine-grained way, and when it // finds a position that diverges it reports that as an error. // -// For simplicity, it aims to satify the following requirements: +// For simplicity, it aims to satisfy the following requirements: // // 1. For each block, if we discover a divergent instruction either at the // top level or embedded in a value position (e.g., the RHS of a let, or diff --git a/external-crates/move/crates/move-compiler/src/hlir/translate.rs b/external-crates/move/crates/move-compiler/src/hlir/translate.rs index 03d5b9304e2..a128afbc2ed 100644 --- a/external-crates/move/crates/move-compiler/src/hlir/translate.rs +++ b/external-crates/move/crates/move-compiler/src/hlir/translate.rs @@ -2433,7 +2433,7 @@ fn freeze(context: &mut Context, expected_type: &H::Type, e: H::Exp) -> (Block, T::Single(s) => s.clone(), _ => { let msg = format!( - "ICE list item has Multple type: {}", + "ICE list item has Multiple type: {}", debug_display_verbose!(e.ty) ); context.env.add_diag(ice!((e.ty.loc, msg))); diff --git a/external-crates/move/crates/move-compiler/src/typing/core.rs b/external-crates/move/crates/move-compiler/src/typing/core.rs index 6a84c7e9fd3..0d99a895a8a 100644 --- a/external-crates/move/crates/move-compiler/src/typing/core.rs +++ b/external-crates/move/crates/move-compiler/src/typing/core.rs @@ -1457,7 +1457,7 @@ fn solve_ability_constraint( let constraint_msg = match &given_msg_opt { Some(s) => s.clone(), - None => format!("'{}' constraint not satisifed", constraint), + None => format!("'{}' constraint not satisfied", constraint), }; let mut diag = diag!(AbilitySafety::Constraint, (loc, constraint_msg)); ability_not_satisfied_tips( diff --git a/external-crates/move/crates/move-compiler/tests/iota_mode/entry_points/receiving_non_object_type.exp b/external-crates/move/crates/move-compiler/tests/iota_mode/entry_points/receiving_non_object_type.exp index f8e0e7d2c9a..315f04c87b7 100644 --- a/external-crates/move/crates/move-compiler/tests/iota_mode/entry_points/receiving_non_object_type.exp +++ b/external-crates/move/crates/move-compiler/tests/iota_mode/entry_points/receiving_non_object_type.exp @@ -5,7 +5,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^ │ │ │ │ │ The type 'u64' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied · 10 │ struct Receiving has drop { │ --- 'key' constraint declared here diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/expansion/macro_identifier_invalid_position.exp b/external-crates/move/crates/move-compiler/tests/move_2024/expansion/macro_identifier_invalid_position.exp index eab40b8b85e..a356fcb6d10 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/expansion/macro_identifier_invalid_position.exp +++ b/external-crates/move/crates/move-compiler/tests/move_2024/expansion/macro_identifier_invalid_position.exp @@ -2,11 +2,11 @@ error[E02010]: invalid name ┌─ tests/move_2024/expansion/macro_identifier_invalid_position.move:1:8 │ 1 │ module $a::m {} - │ ^^ Invalid address name '$a'. Identifiers starting with '$' can be used only for parameters and type paramters + │ ^^ Invalid address name '$a'. Identifiers starting with '$' can be used only for parameters and type parameters error[E02010]: invalid name ┌─ tests/move_2024/expansion/macro_identifier_invalid_position.move:2:8 │ 2 │ module $b::m {} - │ ^^ Invalid address name '$b'. Identifiers starting with '$' can be used only for parameters and type paramters + │ ^^ Invalid address name '$b'. Identifiers starting with '$' can be used only for parameters and type parameters diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/expansion/unnecessary_alias_implicit.exp b/external-crates/move/crates/move-compiler/tests/move_2024/expansion/unnecessary_alias_implicit.exp index 8bb732f38a8..bbff60a5425 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/expansion/unnecessary_alias_implicit.exp +++ b/external-crates/move/crates/move-compiler/tests/move_2024/expansion/unnecessary_alias_implicit.exp @@ -4,7 +4,7 @@ warning[W02021]: duplicate alias 2 │ public struct S() │ - The same alias was previously declared here 3 │ public fun foo() { -4 │ use a::m::S; // unused and duplciate +4 │ use a::m::S; // unused and duplicate │ ^ Unnecessary alias 'S' for module member 'a::m::S'. It was already in scope │ = This warning can be suppressed with '#[allow(duplicate_alias)]' applied to the 'module' or module member ('const', 'fun', or 'struct') @@ -12,7 +12,7 @@ warning[W02021]: duplicate alias warning[W09001]: unused alias ┌─ tests/move_2024/expansion/unnecessary_alias_implicit.move:4:19 │ -4 │ use a::m::S; // unused and duplciate +4 │ use a::m::S; // unused and duplicate │ ^ Unused 'use' of alias 'S'. Consider removing it │ = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct') @@ -22,8 +22,8 @@ warning[W02021]: duplicate alias │ 3 │ public fun foo() { │ --- The same alias was previously declared here -4 │ use a::m::S; // unused and duplciate -5 │ use a::m::foo; // unused and duplciate +4 │ use a::m::S; // unused and duplicate +5 │ use a::m::foo; // unused and duplicate │ ^^^ Unnecessary alias 'foo' for module member 'a::m::foo'. It was already in scope │ = This warning can be suppressed with '#[allow(duplicate_alias)]' applied to the 'module' or module member ('const', 'fun', or 'struct') @@ -31,7 +31,7 @@ warning[W02021]: duplicate alias warning[W09001]: unused alias ┌─ tests/move_2024/expansion/unnecessary_alias_implicit.move:5:19 │ -5 │ use a::m::foo; // unused and duplciate +5 │ use a::m::foo; // unused and duplicate │ ^^^ Unused 'use' of alias 'foo'. Consider removing it │ = This warning can be suppressed with '#[allow(unused_use)]' applied to the 'module' or module member ('const', 'fun', or 'struct') diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/expansion/unnecessary_alias_implicit.move b/external-crates/move/crates/move-compiler/tests/move_2024/expansion/unnecessary_alias_implicit.move index 864a22c8c43..1379b64c76f 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/expansion/unnecessary_alias_implicit.move +++ b/external-crates/move/crates/move-compiler/tests/move_2024/expansion/unnecessary_alias_implicit.move @@ -1,7 +1,7 @@ module a::m { public struct S() public fun foo() { - use a::m::S; // unused and duplciate - use a::m::foo; // unused and duplciate + use a::m::S; // unused and duplicate + use a::m::foo; // unused and duplicate } } diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/migration/let_mut_migrate.move b/external-crates/move/crates/move-compiler/tests/move_2024/migration/let_mut_migrate.move index 448921b66d4..0467a471038 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/migration/let_mut_migrate.move +++ b/external-crates/move/crates/move-compiler/tests/move_2024/migration/let_mut_migrate.move @@ -3,7 +3,7 @@ module a::m { public fun t(x: u64, yip: u64, s: S): u64 { let yes = 0; let S { f: fin } = s; - // these four assignments necessiate mut annotations above + // these four assignments necessitate mut annotations above yip = 0; x = yes + 1; fin = fin + 1; diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/typing/index_call_constraints_unsatisfied.exp b/external-crates/move/crates/move-compiler/tests/move_2024/typing/index_call_constraints_unsatisfied.exp index 37f8d2c5f80..9d2afd27138 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/typing/index_call_constraints_unsatisfied.exp +++ b/external-crates/move/crates/move-compiler/tests/move_2024/typing/index_call_constraints_unsatisfied.exp @@ -9,7 +9,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'copy' ability would need to be added here 18 │ let _b_val = b[]; - │ ^^^ 'copy' constraint not satisifed + │ ^^^ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:18:18 @@ -22,7 +22,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'drop' ability would need to be added here 18 │ let _b_val = b[]; - │ ^^^ 'drop' constraint not satisifed + │ ^^^ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:18:18 @@ -57,7 +57,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'copy' ability would need to be added here 23 │ let _b_val = &b[]; - │ ^^^^ 'copy' constraint not satisifed + │ ^^^^ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:23:18 @@ -70,7 +70,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'drop' ability would need to be added here 23 │ let _b_val = &b[]; - │ ^^^^ 'drop' constraint not satisifed + │ ^^^^ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:23:19 @@ -83,7 +83,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'copy' ability would need to be added here 23 │ let _b_val = &b[]; - │ ^^^ 'copy' constraint not satisifed + │ ^^^ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:23:19 @@ -96,7 +96,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'drop' ability would need to be added here 23 │ let _b_val = &b[]; - │ ^^^ 'drop' constraint not satisifed + │ ^^^ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:28:18 @@ -109,7 +109,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'copy' ability would need to be added here 28 │ let _b_val = &mut b[]; - │ ^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:28:23 @@ -122,7 +122,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'copy' ability would need to be added here 28 │ let _b_val = &mut b[]; - │ ^^^ 'copy' constraint not satisifed + │ ^^^ 'copy' constraint not satisfied error[E01013]: invalid 'move' or 'copy' ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:33:18 @@ -143,7 +143,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'drop' ability would need to be added here 38 │ let _b_val = &b[]; // invalid - │ ^^^^ 'drop' constraint not satisifed + │ ^^^^ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:38:19 @@ -156,7 +156,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'drop' ability would need to be added here 38 │ let _b_val = &b[]; // invalid - │ ^^^ 'drop' constraint not satisifed + │ ^^^ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:39:19 @@ -170,7 +170,7 @@ error[E05001]: ability constraint not satisfied │ To satisfy the constraint, the 'copy' ability would need to be added here 38 │ let _b_val = &b[]; // invalid 39 │ let _mb_val = &mut mb[]; // invalid - │ ^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:39:24 @@ -184,7 +184,7 @@ error[E05001]: ability constraint not satisfied │ To satisfy the constraint, the 'copy' ability would need to be added here 38 │ let _b_val = &b[]; // invalid 39 │ let _mb_val = &mut mb[]; // invalid - │ ^^^^ 'copy' constraint not satisifed + │ ^^^^ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:44:18 @@ -197,7 +197,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'copy' ability would need to be added here 44 │ let _b_val = &b[]; - │ ^^^^ 'copy' constraint not satisifed + │ ^^^^ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:44:19 @@ -210,7 +210,7 @@ error[E05001]: ability constraint not satisfied │ │ │ To satisfy the constraint, the 'copy' ability would need to be added here 44 │ let _b_val = &b[]; - │ ^^^ 'copy' constraint not satisifed + │ ^^^ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:45:19 @@ -224,7 +224,7 @@ error[E05001]: ability constraint not satisfied │ To satisfy the constraint, the 'drop' ability would need to be added here 44 │ let _b_val = &b[]; 45 │ let _mb_val = &mut mb[]; - │ ^^^^^^^^^ 'drop' constraint not satisifed + │ ^^^^^^^^^ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/index_call_constraints_unsatisfied.move:45:24 @@ -238,5 +238,5 @@ error[E05001]: ability constraint not satisfied │ To satisfy the constraint, the 'drop' ability would need to be added here 44 │ let _b_val = &b[]; 45 │ let _mb_val = &mut mb[]; - │ ^^^^ 'drop' constraint not satisifed + │ ^^^^ 'drop' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_assign.move b/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_assign.move index 889604bb18f..7d88e0d39a0 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_assign.move +++ b/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_assign.move @@ -3,7 +3,7 @@ module a::m { public fun t(x: u64, s: S): u64 { let y = 0; let S { f } = s; - // these three assignments necessiate mut annotations above + // these three assignments necessitate mut annotations above x = y + 1; f = f + 1; y = x + f; diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut.move b/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut.move index 38d50260853..dda0b89005c 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut.move +++ b/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut.move @@ -3,7 +3,7 @@ module a::m { public fun t(x: u64, s: S) { let y = 0; let S { f } = s; - // these three borrows necessiate mut annotations above + // these three borrows necessitate mut annotations above foo(&mut x); foo(&mut y); foo(&mut f); diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut_dot_call.move b/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut_dot_call.move index 09741d55465..b951d8c8c0e 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut_dot_call.move +++ b/external-crates/move/crates/move-compiler/tests/move_2024/typing/let_mut_borrow_mut_dot_call.move @@ -4,7 +4,7 @@ module a::m { public fun t(x: S, r: R) { let y = S { f: 0 }; let R { s } = r; - // these three borrows necessiate mut annotations above + // these three borrows necessitate mut annotations above x.foo(); y.foo(); s.foo(); diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/typing/macro_duck_typing_constraint_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_2024/typing/macro_duck_typing_constraint_invalid.exp index 8c01e08517e..ea9eb2b2020 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/typing/macro_duck_typing_constraint_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_2024/typing/macro_duck_typing_constraint_invalid.exp @@ -7,7 +7,7 @@ error[E05001]: ability constraint not satisfied │ ---- To satisfy the constraint, the 'copy' ability would need to be added here · 9 │ macro fun needs_copy<$T, $U, $V>(_: X<$T>, _: $U, $v: $V): X<$U> { - │ ^^^^^ 'copy' constraint not satisifed + │ ^^^^^ 'copy' constraint not satisfied · 17 │ needs_copy!(X(), None(), None()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -21,7 +21,7 @@ error[E05001]: ability constraint not satisfied │ ---- To satisfy the constraint, the 'copy' ability would need to be added here · 9 │ macro fun needs_copy<$T, $U, $V>(_: X<$T>, _: $U, $v: $V): X<$U> { - │ ^^^^^ 'copy' constraint not satisifed + │ ^^^^^ 'copy' constraint not satisfied · 17 │ needs_copy!(X(), None(), None()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -36,7 +36,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 11 │ mycopy(&v); - │ ^^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^^ 'copy' constraint not satisfied · 17 │ needs_copy!(X(), None(), None()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -50,7 +50,7 @@ error[E05001]: ability constraint not satisfied │ ---- To satisfy the constraint, the 'copy' ability would need to be added here · 12 │ X() - │ ^^^ 'copy' constraint not satisifed + │ ^^^ 'copy' constraint not satisfied · 17 │ needs_copy!(X(), None(), None()); │ ---- The type 'a::m::None' does not have the ability 'copy' diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/typing/macro_subst_tparams_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_2024/typing/macro_subst_tparams_invalid.exp index b4ce70e9039..7847c438d13 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/typing/macro_subst_tparams_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_2024/typing/macro_subst_tparams_invalid.exp @@ -7,7 +7,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 10 │ macro fun useless<$U>($x: X<$U>): X<$U> { - │ ^^^^^ 'copy' constraint not satisifed + │ ^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -21,7 +21,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 10 │ macro fun useless<$U>($x: X<$U>): X<$U> { - │ ^^^^^ 'copy' constraint not satisifed + │ ^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -35,7 +35,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 12 │ freeze>(&mut X()); - │ ^^^^^ 'copy' constraint not satisifed + │ ^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -49,7 +49,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 12 │ freeze>(&mut X()); - │ ^^^ 'copy' constraint not satisifed + │ ^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -64,7 +64,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 13 │ f<$U>(X()); - │ ^^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -78,7 +78,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 13 │ f<$U>(X()); - │ ^^^ 'copy' constraint not satisifed + │ ^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -92,7 +92,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 14 │ X<$U>(); - │ ^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -107,7 +107,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 15 │ x.f<$U>(); - │ ^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -121,7 +121,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 16 │ apply!(x, |_: X<$U>| ()); - │ ^^^^^ 'copy' constraint not satisifed + │ ^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -135,7 +135,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 17 │ X<$U>() = x; - │ ^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -149,7 +149,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 18 │ let _: X<$U> = x; - │ ^^^^^ 'copy' constraint not satisifed + │ ^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -163,7 +163,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 19 │ let X<$U>() = x; - │ ^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -186,7 +186,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 21 │ (x: X<$U>); - │ ^^^^^ 'copy' constraint not satisifed + │ ^^^^^ 'copy' constraint not satisfied · 27 │ useless!(X()); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -200,7 +200,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 27 │ useless!(X()); - │ ---- ^^^ 'copy' constraint not satisifed + │ ---- ^^^ 'copy' constraint not satisfied │ │ │ The type 'a::m::None' does not have the ability 'copy' diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/typing/macros_types_checked_invalid_constraints.exp b/external-crates/move/crates/move-compiler/tests/move_2024/typing/macros_types_checked_invalid_constraints.exp index 9b194ced897..82c428250f4 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/typing/macros_types_checked_invalid_constraints.exp +++ b/external-crates/move/crates/move-compiler/tests/move_2024/typing/macros_types_checked_invalid_constraints.exp @@ -7,7 +7,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 8 │ $_n: NeedsCopy<$T>, - │ ^^^^^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^^^^^ 'copy' constraint not satisfied · 24 │ foo!>(0, &mut 1, NeedsCopy {}); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -21,7 +21,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 10 │ let _: NeedsCopy<$U> = NeedsCopy {}; - │ ^^^^^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^^^^^ 'copy' constraint not satisfied · 26 │ foo!(0, &mut 1, NeedsCopy {}); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -35,7 +35,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 10 │ let _: NeedsCopy<$U> = NeedsCopy {}; - │ ^^^^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^^^^ 'copy' constraint not satisfied · 26 │ foo!(0, &mut 1, NeedsCopy {}); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -55,7 +55,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 17 │ macro fun ret2<$T>(): NeedsCopy<$T> { - │ ^^^^^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^^^^^ 'copy' constraint not satisfied · 28 │ ret2!(); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -69,7 +69,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 18 │ NeedsCopy {} - │ ^^^^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^^^^ 'copy' constraint not satisfied · 28 │ ret2!(); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -87,7 +87,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type 'a::m::None' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/macros_types_checked_invalid_constraints.move:25:19 @@ -101,7 +101,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type 'a::m::None' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_2024/typing/macros_types_checked_invalid_constraints.move:27:9 diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/typing/macros_types_checked_invalid_constraints_simple.exp b/external-crates/move/crates/move-compiler/tests/move_2024/typing/macros_types_checked_invalid_constraints_simple.exp index 2de9b2db720..42ecdc0db3c 100644 --- a/external-crates/move/crates/move-compiler/tests/move_2024/typing/macros_types_checked_invalid_constraints_simple.exp +++ b/external-crates/move/crates/move-compiler/tests/move_2024/typing/macros_types_checked_invalid_constraints_simple.exp @@ -7,7 +7,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 7 │ macro fun bar<$T>(_: NeedsCopy<$T>) {} - │ ^^^^^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^^^^^ 'copy' constraint not satisfied · 14 │ bar!(NeedsCopy {}); │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -21,7 +21,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'copy' constraint declared here · 9 │ macro fun baz<$T>(): NeedsCopy<$T> { abort 0 } - │ ^^^^^^^^^^^^^ 'copy' constraint not satisifed + │ ^^^^^^^^^^^^^ 'copy' constraint not satisfied · 18 │ baz!(); // TODO do not complain about dead code? │ ---- The type 'a::m::None' does not have the ability 'copy' @@ -47,5 +47,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^ │ │ │ │ │ The type 'a::m::None' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.exp index 28ae29e45e5..c7168d30d38 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_generic_in_field.exp @@ -7,7 +7,7 @@ error[E05001]: ability constraint not satisfied │ - ^^^^ │ │ │ │ │ │ │ The type 'T' does not have the ability 'copy' - │ │ 'copy' constraint not satisifed + │ │ 'copy' constraint not satisfied │ To satisfy the constraint, the 'copy' ability would need to be added here error[E05001]: ability constraint not satisfied @@ -22,5 +22,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^ │ │ │ │ │ The type 'T' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_prims_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_prims_invalid.exp index 152e2bda505..3cbea626dab 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_prims_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_prims_invalid.exp @@ -8,7 +8,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^ │ │ │ │ │ The type 'signer' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:21:9 @@ -21,7 +21,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector' can have the ability 'copy' but the type argument 'signer' does not have the required ability 'copy' │ │ The type 'vector' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:22:9 @@ -34,7 +34,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type 'vector<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:23:9 @@ -46,7 +46,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^ │ │ │ │ │ The type 'u64' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:24:9 @@ -58,7 +58,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^ │ │ │ │ │ The type 'signer' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:25:9 @@ -70,7 +70,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type 'vector<0x42::M::NoC>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:26:9 @@ -82,7 +82,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type 'vector<0x42::M::NoK>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:27:9 @@ -94,7 +94,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^ │ │ │ │ │ The type 'signer' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:27:9 @@ -106,7 +106,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^ │ │ │ │ │ The type 'signer' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:28:9 @@ -119,7 +119,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type 'vector<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:29:9 @@ -132,7 +132,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::Cup>' can have the ability 'copy' but the type argument '0x42::M::Cup' does not have the required ability 'copy' │ │ The type 'vector<0x42::M::Cup>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:29:9 @@ -145,7 +145,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::Cup>' can have the ability 'drop' but the type argument '0x42::M::Cup' does not have the required ability 'drop' │ │ The type 'vector<0x42::M::Cup>' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:29:9 @@ -158,7 +158,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::Cup>' can have the ability 'store' but the type argument '0x42::M::Cup' does not have the required ability 'store' │ │ The type 'vector<0x42::M::Cup>' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:30:13 @@ -169,7 +169,7 @@ error[E05001]: ability constraint not satisfied 30 │ let Sc {} = Sc {}; │ ^^^^^ ------ The type 'signer' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:30:21 @@ -181,7 +181,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^ │ │ │ │ │ The type 'signer' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:31:13 @@ -194,7 +194,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector' can have the ability 'copy' but the type argument 'signer' does not have the required ability 'copy' │ │ The type 'vector' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:31:21 @@ -207,7 +207,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector' can have the ability 'copy' but the type argument 'signer' does not have the required ability 'copy' │ │ The type 'vector' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:32:13 @@ -220,7 +220,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type 'vector<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:32:21 @@ -233,7 +233,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type 'vector<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:33:13 @@ -244,7 +244,7 @@ error[E05001]: ability constraint not satisfied 33 │ let Sk {} = Sk {}; │ ^^^^^ --- The type 'u64' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:33:21 @@ -256,7 +256,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^ │ │ │ │ │ The type 'u64' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:34:13 @@ -267,7 +267,7 @@ error[E05001]: ability constraint not satisfied 34 │ let Sk {} = Sk {}; │ ^^^^^ ------ The type 'signer' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:34:21 @@ -279,7 +279,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^ │ │ │ │ │ The type 'signer' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:35:13 @@ -290,7 +290,7 @@ error[E05001]: ability constraint not satisfied 35 │ let Sk {} = Sk> {}; │ ^^^^^ ----------- The type 'vector<0x42::M::NoC>' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:35:21 @@ -302,7 +302,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type 'vector<0x42::M::NoC>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:36:13 @@ -313,7 +313,7 @@ error[E05001]: ability constraint not satisfied 36 │ let Sk {} = Sk> {}; │ ^^^^^ ----------- The type 'vector<0x42::M::NoK>' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:36:21 @@ -325,7 +325,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type 'vector<0x42::M::NoK>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:37:13 @@ -336,7 +336,7 @@ error[E05001]: ability constraint not satisfied 37 │ let Scds {} = Scds {}; │ ^^^^^^^ ------ The type 'signer' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:37:13 @@ -347,7 +347,7 @@ error[E05001]: ability constraint not satisfied 37 │ let Scds {} = Scds {}; │ ^^^^^^^ ------ The type 'signer' does not have the ability 'store' │ │ - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:37:23 @@ -359,7 +359,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type 'signer' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:37:23 @@ -371,7 +371,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type 'signer' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:38:13 @@ -384,7 +384,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type 'vector<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:38:23 @@ -397,7 +397,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type 'vector<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:13 @@ -410,7 +410,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::Cup>' can have the ability 'copy' but the type argument '0x42::M::Cup' does not have the required ability 'copy' │ │ The type 'vector<0x42::M::Cup>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:13 @@ -423,7 +423,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::Cup>' can have the ability 'drop' but the type argument '0x42::M::Cup' does not have the required ability 'drop' │ │ The type 'vector<0x42::M::Cup>' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:13 @@ -436,7 +436,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::Cup>' can have the ability 'store' but the type argument '0x42::M::Cup' does not have the required ability 'store' │ │ The type 'vector<0x42::M::Cup>' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:23 @@ -449,7 +449,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::Cup>' can have the ability 'copy' but the type argument '0x42::M::Cup' does not have the required ability 'copy' │ │ The type 'vector<0x42::M::Cup>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:23 @@ -462,7 +462,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::Cup>' can have the ability 'drop' but the type argument '0x42::M::Cup' does not have the required ability 'drop' │ │ The type 'vector<0x42::M::Cup>' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_prims_invalid.move:39:23 @@ -475,5 +475,5 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type 'vector<0x42::M::Cup>' can have the ability 'store' but the type argument '0x42::M::Cup' does not have the required ability 'store' │ │ The type 'vector<0x42::M::Cup>' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_structs_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_structs_invalid.exp index 7d71e664c68..71b91b72b0c 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_structs_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_structs_invalid.exp @@ -11,7 +11,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^ │ │ │ │ │ The type '0x42::M::NoC' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:20:9 @@ -26,7 +26,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:21:9 @@ -39,7 +39,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type '0x42::M::Box<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:22:9 @@ -54,7 +54,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^ │ │ │ │ │ The type '0x42::M::NoK' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:23:9 @@ -69,7 +69,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:24:9 @@ -82,7 +82,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box<0x42::M::Cup>' can have the ability 'key' but the type argument '0x42::M::Cup' does not have the required ability 'store' │ │ The type '0x42::M::Box<0x42::M::Cup>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:25:9 @@ -97,7 +97,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::NoC' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:26:9 @@ -112,7 +112,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:26:9 @@ -127,7 +127,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:26:9 @@ -142,7 +142,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:27:9 @@ -157,7 +157,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:27:9 @@ -172,7 +172,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:27:9 @@ -187,7 +187,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:28:9 @@ -200,7 +200,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Pair' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type '0x42::M::Pair' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:29:13 @@ -214,7 +214,7 @@ error[E05001]: ability constraint not satisfied 29 │ let Sc {} = Sc {}; │ ^^^^^ --- The type '0x42::M::NoC' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:29:21 @@ -229,7 +229,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::NoC' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:30:13 @@ -243,7 +243,7 @@ error[E05001]: ability constraint not satisfied 30 │ let Sc {} = Sc> {}; │ ^^^^^ -------- The type '0x42::M::Cup' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:30:21 @@ -258,7 +258,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:31:13 @@ -271,7 +271,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type '0x42::M::Box<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:31:21 @@ -284,7 +284,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box<0x42::M::NoC>' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type '0x42::M::Box<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:32:13 @@ -298,7 +298,7 @@ error[E05001]: ability constraint not satisfied 32 │ let Sk {} = Sk {}; │ ^^^^^ --- The type '0x42::M::NoK' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:32:21 @@ -313,7 +313,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::NoK' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:33:13 @@ -327,7 +327,7 @@ error[E05001]: ability constraint not satisfied 33 │ let Sk {} = Sk> {}; │ ^^^^^ -------- The type '0x42::M::Cup' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:33:21 @@ -342,7 +342,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:34:13 @@ -355,7 +355,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box<0x42::M::Cup>' can have the ability 'key' but the type argument '0x42::M::Cup' does not have the required ability 'store' │ │ The type '0x42::M::Box<0x42::M::Cup>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:34:21 @@ -368,7 +368,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box<0x42::M::Cup>' can have the ability 'key' but the type argument '0x42::M::Cup' does not have the required ability 'store' │ │ The type '0x42::M::Box<0x42::M::Cup>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:35:13 @@ -382,7 +382,7 @@ error[E05001]: ability constraint not satisfied 35 │ let Scds {} = Scds {}; │ ^^^^^^^ --- The type '0x42::M::NoC' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:35:23 @@ -397,7 +397,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::NoC' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:13 @@ -411,7 +411,7 @@ error[E05001]: ability constraint not satisfied 36 │ let Scds {} = Scds> {}; │ ^^^^^^^ -------- The type '0x42::M::Cup' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:13 @@ -425,7 +425,7 @@ error[E05001]: ability constraint not satisfied 36 │ let Scds {} = Scds> {}; │ ^^^^^^^ -------- The type '0x42::M::Cup' does not have the ability 'drop' │ │ - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:13 @@ -439,7 +439,7 @@ error[E05001]: ability constraint not satisfied 36 │ let Scds {} = Scds> {}; │ ^^^^^^^ -------- The type '0x42::M::Cup' does not have the ability 'store' │ │ - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:23 @@ -454,7 +454,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:23 @@ -469,7 +469,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:36:23 @@ -484,7 +484,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:13 @@ -498,7 +498,7 @@ error[E05001]: ability constraint not satisfied 37 │ let Scds {} = Scds> {}; │ ^^^^^^^ -------- The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:13 @@ -512,7 +512,7 @@ error[E05001]: ability constraint not satisfied 37 │ let Scds {} = Scds> {}; │ ^^^^^^^ -------- The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'drop' │ │ - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:13 @@ -526,7 +526,7 @@ error[E05001]: ability constraint not satisfied 37 │ let Scds {} = Scds> {}; │ ^^^^^^^ -------- The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'store' │ │ - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:23 @@ -541,7 +541,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:23 @@ -556,7 +556,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:37:23 @@ -571,7 +571,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup<0x42::M::NoC>' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:38:13 @@ -584,7 +584,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Pair' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type '0x42::M::Pair' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_structs_invalid.move:38:23 @@ -597,5 +597,5 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Pair' can have the ability 'copy' but the type argument '0x42::M::NoC' does not have the required ability 'copy' │ │ The type '0x42::M::Pair' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_tparams_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_tparams_invalid.exp index 3060f5e037e..8630345a6ec 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_tparams_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/ability_constraint_tparams_invalid.exp @@ -11,7 +11,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^ │ │ │ │ │ The type 'TnoC' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:22:9 @@ -26,7 +26,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:23:9 @@ -39,7 +39,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy' │ │ The type '0x42::M::Box' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:24:9 @@ -54,7 +54,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^ │ │ │ │ │ The type 'TnoK' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:25:9 @@ -69,7 +69,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:26:9 @@ -82,7 +82,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box<0x42::M::Cup>' can have the ability 'key' but the type argument '0x42::M::Cup' does not have the required ability 'store' │ │ The type '0x42::M::Box<0x42::M::Cup>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:27:9 @@ -97,7 +97,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^ │ │ │ │ │ The type 'TnoC' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:28:9 @@ -112,7 +112,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:28:9 @@ -127,7 +127,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:28:9 @@ -142,7 +142,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:29:9 @@ -157,7 +157,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:29:9 @@ -172,7 +172,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:29:9 @@ -187,7 +187,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:30:9 @@ -200,7 +200,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Pair' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy' │ │ The type '0x42::M::Pair' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:31:13 @@ -214,7 +214,7 @@ error[E05001]: ability constraint not satisfied 31 │ let Sc {} = Sc {}; │ ^^^^^ ---- The type 'TnoC' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:31:21 @@ -229,7 +229,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^ │ │ │ │ │ The type 'TnoC' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:32:13 @@ -243,7 +243,7 @@ error[E05001]: ability constraint not satisfied 32 │ let Sc {} = Sc> {}; │ ^^^^^ --------- The type '0x42::M::Cup' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:32:21 @@ -258,7 +258,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:33:13 @@ -271,7 +271,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy' │ │ The type '0x42::M::Box' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:33:21 @@ -284,7 +284,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy' │ │ The type '0x42::M::Box' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:34:13 @@ -298,7 +298,7 @@ error[E05001]: ability constraint not satisfied 34 │ let Sk {} = Sk {}; │ ^^^^^ ---- The type 'TnoK' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:34:21 @@ -313,7 +313,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^ │ │ │ │ │ The type 'TnoK' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:35:13 @@ -327,7 +327,7 @@ error[E05001]: ability constraint not satisfied 35 │ let Sk {} = Sk> {}; │ ^^^^^ --------- The type '0x42::M::Cup' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:35:21 @@ -342,7 +342,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:36:13 @@ -355,7 +355,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box<0x42::M::Cup>' can have the ability 'key' but the type argument '0x42::M::Cup' does not have the required ability 'store' │ │ The type '0x42::M::Box<0x42::M::Cup>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:36:21 @@ -368,7 +368,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Box<0x42::M::Cup>' can have the ability 'key' but the type argument '0x42::M::Cup' does not have the required ability 'store' │ │ The type '0x42::M::Box<0x42::M::Cup>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:37:13 @@ -382,7 +382,7 @@ error[E05001]: ability constraint not satisfied 37 │ let Scds {} = Scds {}; │ ^^^^^^^ ---- The type 'TnoC' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:37:23 @@ -397,7 +397,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^ │ │ │ │ │ The type 'TnoC' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:13 @@ -411,7 +411,7 @@ error[E05001]: ability constraint not satisfied 38 │ let Scds {} = Scds> {}; │ ^^^^^^^ --------- The type '0x42::M::Cup' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:13 @@ -425,7 +425,7 @@ error[E05001]: ability constraint not satisfied 38 │ let Scds {} = Scds> {}; │ ^^^^^^^ --------- The type '0x42::M::Cup' does not have the ability 'drop' │ │ - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:13 @@ -439,7 +439,7 @@ error[E05001]: ability constraint not satisfied 38 │ let Scds {} = Scds> {}; │ ^^^^^^^ --------- The type '0x42::M::Cup' does not have the ability 'store' │ │ - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:23 @@ -454,7 +454,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:23 @@ -469,7 +469,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:38:23 @@ -484,7 +484,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:13 @@ -498,7 +498,7 @@ error[E05001]: ability constraint not satisfied 39 │ let Scds {} = Scds> {}; │ ^^^^^^^ --------- The type '0x42::M::Cup' does not have the ability 'copy' │ │ - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:13 @@ -512,7 +512,7 @@ error[E05001]: ability constraint not satisfied 39 │ let Scds {} = Scds> {}; │ ^^^^^^^ --------- The type '0x42::M::Cup' does not have the ability 'drop' │ │ - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:13 @@ -526,7 +526,7 @@ error[E05001]: ability constraint not satisfied 39 │ let Scds {} = Scds> {}; │ ^^^^^^^ --------- The type '0x42::M::Cup' does not have the ability 'store' │ │ - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:23 @@ -541,7 +541,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:23 @@ -556,7 +556,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:39:23 @@ -571,7 +571,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x42::M::Cup' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:40:13 @@ -584,7 +584,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Pair' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy' │ │ The type '0x42::M::Pair' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/ability_constraint_tparams_invalid.move:40:23 @@ -597,5 +597,5 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::Pair' can have the ability 'copy' but the type argument 'TnoC' does not have the required ability 'copy' │ │ The type '0x42::M::Pair' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.exp index eeb37808c80..a0b3e2dcdea 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_all_cases.exp @@ -8,7 +8,7 @@ error[E05001]: ability constraint not satisfied │ - ^^^^^^^ │ │ │ │ │ │ │ The type 'T' does not have the ability 'copy' - │ │ 'copy' constraint not satisifed + │ │ 'copy' constraint not satisfied │ To satisfy the constraint, the 'copy' ability would need to be added here error[E05001]: ability constraint not satisfied @@ -21,7 +21,7 @@ error[E05001]: ability constraint not satisfied │ - ^^^^^^^ │ │ │ │ │ │ │ The type 'T' does not have the ability 'key' - │ │ 'key' constraint not satisifed + │ │ 'key' constraint not satisfied │ To satisfy the constraint, the 'key' ability would need to be added here error[E05001]: ability constraint not satisfied @@ -34,7 +34,7 @@ error[E05001]: ability constraint not satisfied │ - ^^^^^^^ │ │ │ │ │ │ │ The type 'T' does not have the ability 'copy' - │ │ 'copy' constraint not satisifed + │ │ 'copy' constraint not satisfied │ To satisfy the constraint, the 'copy' ability would need to be added here error[E05001]: ability constraint not satisfied @@ -47,7 +47,7 @@ error[E05001]: ability constraint not satisfied │ - ^^^^^^^ │ │ │ │ │ │ │ The type 'T' does not have the ability 'key' - │ │ 'key' constraint not satisifed + │ │ 'key' constraint not satisfied │ To satisfy the constraint, the 'key' ability would need to be added here error[E05001]: ability constraint not satisfied @@ -62,7 +62,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/constraints_not_satisfied_all_cases.move:15:28 @@ -77,5 +77,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::C' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.exp index 764660a69f3..a6fbda04110 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_parameter.exp @@ -10,5 +10,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.exp index 7ccbfef4025..44ead01f7c8 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_function_return_type.exp @@ -10,5 +10,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.exp index 20bef8e20c4..e9ae461f8f8 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.exp @@ -10,7 +10,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied warning[W09005]: dead or unreachable code ┌─ tests/move_check/typing/constraints_not_satisfied_lvalues_bind_type.move:6:27 diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.exp index c524b45d170..c34c0a52c67 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_decl_type.exp @@ -10,5 +10,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.exp index 906ea6b17c5..39a054ed75f 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.exp @@ -10,7 +10,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied warning[W09005]: dead or unreachable code ┌─ tests/move_check/typing/constraints_not_satisfied_lvalues_pack_type_args.move:8:29 @@ -32,5 +32,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.exp index dea7b7bd6e1..8636333230b 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_struct_field.exp @@ -10,5 +10,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_annotation.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_annotation.exp index 55b49a84ce1..c793f2172bc 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_annotation.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_annotation.exp @@ -19,5 +19,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.exp index c0c475af892..c647140c1f9 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_call.exp @@ -10,5 +10,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.exp index cf7f38e712f..9f21541de58 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.exp @@ -20,7 +20,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied warning[W09005]: dead or unreachable code ┌─ tests/move_check/typing/constraints_not_satisfied_type_arguments_internal_pack.move:8:26 diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/instantiate_signatures.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/instantiate_signatures.exp index 737f559892f..972e709777f 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/instantiate_signatures.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/instantiate_signatures.exp @@ -10,7 +10,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^ │ │ │ │ │ The type '0x42::M::R' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E04004]: expected a single non-reference type ┌─ tests/move_check/typing/instantiate_signatures.move:12:13 @@ -60,7 +60,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^ │ │ │ │ │ The type '0x42::M::R' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E04004]: expected a single non-reference type ┌─ tests/move_check/typing/instantiate_signatures.move:19:14 @@ -101,7 +101,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^ │ │ │ │ │ The type '0x42::M::R' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E04004]: expected a single non-reference type ┌─ tests/move_check/typing/instantiate_signatures.move:24:9 @@ -142,7 +142,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^ │ │ │ │ │ The type '0x42::M::R' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E04004]: expected a single non-reference type ┌─ tests/move_check/typing/instantiate_signatures.move:33:18 @@ -193,7 +193,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^ │ │ │ │ │ The type '0x42::M::R' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E04004]: expected a single non-reference type ┌─ tests/move_check/typing/instantiate_signatures.move:38:12 @@ -242,7 +242,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::S<0x42::M::R>' can have the ability 'drop' but the type argument '0x42::M::R' does not have the required ability 'drop' │ │ The type '0x42::M::S<0x42::M::R>' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/instantiate_signatures.move:42:9 @@ -266,7 +266,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^ │ │ │ │ │ The type '0x42::M::R' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E04004]: expected a single non-reference type ┌─ tests/move_check/typing/instantiate_signatures.move:43:11 diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/module_call_constraints_not_satisfied.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/module_call_constraints_not_satisfied.exp index 93c3ea62cce..6f5c4c4a765 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/module_call_constraints_not_satisfied.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/module_call_constraints_not_satisfied.exp @@ -11,7 +11,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::S' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:28:9 @@ -26,7 +26,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Coin' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:29:9 @@ -38,7 +38,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type 'u64' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:29:9 @@ -53,7 +53,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Coin' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:33:9 @@ -68,7 +68,7 @@ error[E05001]: ability constraint not satisfied │ --- 'key' constraint declared here · 33 │ both(new_box(), new_box()) - │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 'key' constraint not satisifed + │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:33:9 @@ -83,7 +83,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box' can have the ability 'copy' but the type argument 'R' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:37:9 @@ -98,7 +98,7 @@ error[E05001]: ability constraint not satisfied │ --- 'key' constraint declared here · 37 │ rsrc(new_box3()); - │ ^^^^^^^^^^^^^^^^^^^^^^^^^ 'key' constraint not satisifed + │ ^^^^^^^^^^^^^^^^^^^^^^^^^ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:39:9 @@ -113,7 +113,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'R' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:40:9 @@ -128,7 +128,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:41:9 @@ -143,7 +143,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:43:9 @@ -158,7 +158,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:44:9 @@ -173,7 +173,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'R' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:45:9 @@ -188,7 +188,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'R' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:47:9 @@ -203,7 +203,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'R' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:51:9 @@ -218,7 +218,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'U' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:52:9 @@ -233,7 +233,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:53:9 @@ -248,7 +248,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:55:9 @@ -263,7 +263,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'C' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:56:9 @@ -278,7 +278,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'U' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:57:9 @@ -293,7 +293,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'U' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/module_call_constraints_not_satisfied.move:59:9 @@ -308,5 +308,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Box3' can have the ability 'copy' but the type argument 'U' does not have the required ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.move b/external-crates/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.move index 3d9fe2f0364..7da1aca5925 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.move +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/module_call_entry_function_was_invalid.move @@ -1,6 +1,6 @@ address 0x2 { -// entry functions (previously public(script)) used to have visbility restrictions. +// entry functions (previously public(script)) used to have visibility restrictions. // These have been removed module X { diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/pack_constraint_not_satisfied.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/pack_constraint_not_satisfied.exp index 118a0b52a34..2611b8e6abb 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/pack_constraint_not_satisfied.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/pack_constraint_not_satisfied.exp @@ -7,7 +7,7 @@ error[E05001]: ability constraint not satisfied 7 │ R {r:_ } = R { r: 0 }; │ ^^^^^^^^ - The type 'u64' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:7:20 @@ -19,7 +19,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^ │ │ │ │ │ The type 'u64' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:8:9 @@ -34,7 +34,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Coin' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:8:9 @@ -57,7 +57,7 @@ error[E05001]: ability constraint not satisfied 12 │ R {r: R { r: _ } } = R { r: R { r: 0 }}; │ ^^^^^^^^^^^^^^^^^^ ---------- The type '0x8675309::M::R' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:12:15 @@ -68,7 +68,7 @@ error[E05001]: ability constraint not satisfied 12 │ R {r: R { r: _ } } = R { r: R { r: 0 }}; │ ^^^^^^^^^^ - The type 'u64' does not have the ability 'key' │ │ - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:12:30 @@ -82,7 +82,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::R' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:12:37 @@ -94,7 +94,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^ │ │ │ │ │ The type 'u64' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:13:9 @@ -107,7 +107,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x8675309::M::S<0x8675309::M::Coin>' can have the ability 'drop' but the type argument '0x8675309::M::Coin' does not have the required ability 'drop' │ │ The type '0x8675309::M::S<0x8675309::M::Coin>' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/pack_constraint_not_satisfied.move:13:9 @@ -132,5 +132,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^^^^^^^^^^^^ │ │ │ │ │ The type '0x8675309::M::Coin' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.exp index 24413e10c9b..a7d83bf8fa8 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_param_op_abilities_invalid.exp @@ -54,7 +54,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store' │ │ The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_param_op_abilities_invalid.move:30:9 @@ -67,5 +67,5 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store' │ │ The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp index ac8f85e668c..2e64240f6c0 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_param_struct_decl_invalid.exp @@ -52,5 +52,5 @@ error[E05001]: ability constraint not satisfied │ ^^^^^ │ │ │ │ │ The type 'T' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.exp index 4c3b52b9ff6..ec60be40b93 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/phantom_params_constraint_abilities_invalid.exp @@ -9,7 +9,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'copy' but the type argument '0x42::M::NoAbilities' does not have the required ability 'copy' │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:11:12 @@ -22,7 +22,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'drop' but the type argument '0x42::M::NoAbilities' does not have the required ability 'drop' │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:11:12 @@ -35,7 +35,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store' │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:11:12 @@ -48,7 +48,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'key' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store' │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:16:12 @@ -66,7 +66,7 @@ error[E05001]: ability constraint not satisfied 18 │ │ HasStore, 19 │ │ HasKey 20 │ │ > - │ ╰──────────────^ 'drop' constraint not satisifed + │ ╰──────────────^ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:16:12 @@ -84,7 +84,7 @@ error[E05001]: ability constraint not satisfied 18 │ │ HasStore, 19 │ │ HasKey 20 │ │ > - │ ╰──────────────^ 'copy' constraint not satisifed + │ ╰──────────────^ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:16:12 @@ -102,7 +102,7 @@ error[E05001]: ability constraint not satisfied │ │ The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store' 19 │ │ HasKey 20 │ │ > - │ ╰──────────────^ 'store' constraint not satisifed + │ ╰──────────────^ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:16:12 @@ -120,7 +120,7 @@ error[E05001]: ability constraint not satisfied │ │ │ The type '0x42::M::HasKey<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'key' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store' │ │ The type '0x42::M::HasKey<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'key' 20 │ │ > - │ ╰──────────────^ 'key' constraint not satisifed + │ ╰──────────────^ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:25:9 @@ -133,7 +133,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'copy' but the type argument '0x42::M::NoAbilities' does not have the required ability 'copy' │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'copy' - │ 'copy' constraint not satisifed + │ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:25:9 @@ -146,7 +146,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'drop' but the type argument '0x42::M::NoAbilities' does not have the required ability 'drop' │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'drop' - │ 'drop' constraint not satisifed + │ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:25:9 @@ -159,7 +159,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'store' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store' │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store' - │ 'store' constraint not satisifed + │ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:25:9 @@ -172,7 +172,7 @@ error[E05001]: ability constraint not satisfied │ │ │ │ │ │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'key' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store' │ │ The type '0x42::M::HasAbilities<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'key' - │ 'key' constraint not satisifed + │ 'key' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:30:9 @@ -189,7 +189,7 @@ error[E05001]: ability constraint not satisfied 32 │ │ HasStore, 33 │ │ HasKey 34 │ │ >(); - │ ╰─────────────^ 'drop' constraint not satisifed + │ ╰─────────────^ 'drop' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:30:9 @@ -206,7 +206,7 @@ error[E05001]: ability constraint not satisfied 32 │ │ HasStore, 33 │ │ HasKey 34 │ │ >(); - │ ╰─────────────^ 'copy' constraint not satisifed + │ ╰─────────────^ 'copy' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:30:9 @@ -223,7 +223,7 @@ error[E05001]: ability constraint not satisfied │ │ The type '0x42::M::HasStore<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'store' 33 │ │ HasKey 34 │ │ >(); - │ ╰─────────────^ 'store' constraint not satisifed + │ ╰─────────────^ 'store' constraint not satisfied error[E05001]: ability constraint not satisfied ┌─ tests/move_check/typing/phantom_params_constraint_abilities_invalid.move:30:9 @@ -240,5 +240,5 @@ error[E05001]: ability constraint not satisfied │ │ │ The type '0x42::M::HasKey<0x42::M::NoAbilities, 0x42::M::NoAbilities>' can have the ability 'key' but the type argument '0x42::M::NoAbilities' does not have the required ability 'store' │ │ The type '0x42::M::HasKey<0x42::M::NoAbilities, 0x42::M::NoAbilities>' does not have the ability 'key' 34 │ │ >(); - │ ╰─────────────^ 'key' constraint not satisifed + │ ╰─────────────^ 'key' constraint not satisfied diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack_invalid.exp index 827465e0385..4272c14b10f 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_pack_invalid.exp @@ -20,7 +20,7 @@ error[E05001]: ability constraint not satisfied │ --- To satisfy the constraint, the 'drop' ability would need to be added here · 47 │ let x = Container::get(&v); - │ ^^^^^^^^^^^^^^^^^^ 'drop' constraint not satisifed + │ ^^^^^^^^^^^^^^^^^^ 'drop' constraint not satisfied 48 │ let b = Box { f1: x, f2: x }; 49 │ Container::put(&mut v, Box {f1: R{}, f2: R{}}); │ ---------------------- The type '0x2::M::Box<0x2::M::R>' does not have the ability 'drop' diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.exp index 50e8a4f7eca..e3c3e16726f 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_assign_invalid.exp @@ -17,7 +17,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'drop' constraint declared here · 43 │ Box { f1, f2 } = Container::get(&v); - │ -------------- ^^^^^^^^^^^^^^^^^^ 'drop' constraint not satisifed + │ -------------- ^^^^^^^^^^^^^^^^^^ 'drop' constraint not satisfied │ │ │ The type '0x2::M::Box<0x2::M::R>' does not have the ability 'drop' │ The type '0x2::M::Box<0x2::M::R>' can have the ability 'drop' but the type argument '0x2::M::R' does not have the required ability 'drop' diff --git a/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_invalid.exp b/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_invalid.exp index da3765cc36c..eb824042cf1 100644 --- a/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_invalid.exp +++ b/external-crates/move/crates/move-compiler/tests/move_check/typing/type_variable_join_threaded_unpack_invalid.exp @@ -17,7 +17,7 @@ error[E05001]: ability constraint not satisfied │ ---- 'drop' constraint declared here · 39 │ let Box { f1, f2 } = Container::get(&v); - │ -------------- ^^^^^^^^^^^^^^^^^^ 'drop' constraint not satisifed + │ -------------- ^^^^^^^^^^^^^^^^^^ 'drop' constraint not satisfied │ │ │ The type '0x2::M::Box<0x2::M::R>' does not have the ability 'drop' │ The type '0x2::M::Box<0x2::M::R>' can have the ability 'drop' but the type argument '0x2::M::R' does not have the required ability 'drop' diff --git a/external-crates/move/crates/move-coverage/src/summary.rs b/external-crates/move/crates/move-coverage/src/summary.rs index 71456b368a9..aa4172c0008 100644 --- a/external-crates/move/crates/move-coverage/src/summary.rs +++ b/external-crates/move/crates/move-coverage/src/summary.rs @@ -139,7 +139,7 @@ pub fn summarize_inst_cov_by_module( let fn_handle = module.function_handle_at(function_def.function); let fn_name = module.identifier_at(fn_handle.name).to_owned(); - let fn_summmary = match &function_def.code { + let fn_summary = match &function_def.code { None => FunctionSummary { fn_is_native: true, total: 0, @@ -163,7 +163,7 @@ pub fn summarize_inst_cov_by_module( } }; - (fn_name, fn_summmary) + (fn_name, fn_summary) }) .collect(); @@ -421,7 +421,7 @@ pub fn summarize_path_cov(module: &CompiledModule, trace_map: &TraceMap) -> Modu let fn_handle = module.function_handle_at(function_def.function); let fn_name = module.identifier_at(fn_handle.name).to_owned(); - let fn_summmary = match &function_def.code { + let fn_summary = match &function_def.code { None => FunctionSummary { fn_is_native: true, total: 0, @@ -437,7 +437,7 @@ pub fn summarize_path_cov(module: &CompiledModule, trace_map: &TraceMap) -> Modu }, }; - (fn_name, fn_summmary) + (fn_name, fn_summary) }) .collect(); diff --git a/external-crates/move/crates/move-package/src/compilation/compiled_package.rs b/external-crates/move/crates/move-package/src/compilation/compiled_package.rs index 9027b3e87e7..4249d23febb 100644 --- a/external-crates/move/crates/move-package/src/compilation/compiled_package.rs +++ b/external-crates/move/crates/move-package/src/compilation/compiled_package.rs @@ -612,7 +612,7 @@ impl CompiledPackage { // We take the (restrictive) view that all filesystems are case insensitive to // maximize portability of packages. fn check_filepaths_ok(&self) -> Result<()> { - // A mapping of (lowercase_name => [info_for_each_occurence] + // A mapping of (lowercase_name => [info_for_each_occurrence] let mut insensitive_mapping = BTreeMap::new(); for compiled_unit in &self.root_compiled_units { let name = compiled_unit.unit.name.as_str(); @@ -626,9 +626,9 @@ impl CompiledPackage { } let errs = insensitive_mapping .into_iter() - .filter_map(|(insensitive_name, occurence_infos)| { - if occurence_infos.len() > 1 { - let name_conflict_error_msg = occurence_infos + .filter_map(|(insensitive_name, occurrence_infos)| { + if occurrence_infos.len() > 1 { + let name_conflict_error_msg = occurrence_infos .into_iter() .map(|(name, fpath)| { format!( diff --git a/external-crates/move/crates/move-package/src/resolution/dependency_graph.rs b/external-crates/move/crates/move-package/src/resolution/dependency_graph.rs index 65ab63c51cc..08a5a181bcb 100644 --- a/external-crates/move/crates/move-package/src/resolution/dependency_graph.rs +++ b/external-crates/move/crates/move-package/src/resolution/dependency_graph.rs @@ -197,7 +197,7 @@ pub enum DependencyMode { } /// Wrapper struct to display a package as an inline table in the lock file -/// (matching the convention in the source manifest). This is necessary becase +/// (matching the convention in the source manifest). This is necessary because /// the `toml` crate does not currently support serializing types as inline /// tables. struct PackageTOML<'a>(&'a Package); diff --git a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.toml b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.toml index e838b2b90a9..b723a318b6b 100644 --- a/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.toml +++ b/external-crates/move/crates/move-package/tests/test_sources/diamond_problem_dep_incorrect_nested/Move.toml @@ -1,5 +1,5 @@ # Dependency graph and an override (ov) - technically, override in the root is capable of resolving -# a conflict in the sub-graph for A but becase we expect sub-graphs to be correct as standalone +# a conflict in the sub-graph for A but because we expect sub-graphs to be correct as standalone # entities (and our algorithm proceeds by constructing sub-graphs independently), this will result # in a failure. # diff --git a/external-crates/move/crates/move-stdlib/tests/vector_tests.move b/external-crates/move/crates/move-stdlib/tests/vector_tests.move index 5480f6b685d..f67a3f245fb 100644 --- a/external-crates/move/crates/move-stdlib/tests/vector_tests.move +++ b/external-crates/move/crates/move-stdlib/tests/vector_tests.move @@ -425,9 +425,9 @@ module std::vector_tests { assert!(index == 1, 1); } - // index_of will return the index first occurence that is equal + // index_of will return the index first occurrence that is equal #[test] - fun index_of_nonempty_has_multiple_occurences() { + fun index_of_nonempty_has_multiple_occurrences() { let v = V::empty(); V::push_back(&mut v, false); V::push_back(&mut v, true); diff --git a/external-crates/move/crates/move-vm-integration-tests/src/tests/exec_func_effects_tests.rs b/external-crates/move/crates/move-vm-integration-tests/src/tests/exec_func_effects_tests.rs index 31c3f979fd9..6466248a73b 100644 --- a/external-crates/move/crates/move-vm-integration-tests/src/tests/exec_func_effects_tests.rs +++ b/external-crates/move/crates/move-vm-integration-tests/src/tests/exec_func_effects_tests.rs @@ -54,8 +54,8 @@ fn fail_arg_deserialize() { } } -// check happy path for writing to mut ref args - may be unecessary / covered by -// other tests +// check happy path for writing to mut ref args - may be unnecessary / covered +// by other tests #[test] fn mutref_output_success() { let mod_code = setup_module(); diff --git a/external-crates/move/crates/move-vm-runtime/src/loader.rs b/external-crates/move/crates/move-vm-runtime/src/loader.rs index 4a3c2af08a9..b09d25614e6 100644 --- a/external-crates/move/crates/move-vm-runtime/src/loader.rs +++ b/external-crates/move/crates/move-vm-runtime/src/loader.rs @@ -1610,7 +1610,7 @@ pub(crate) struct LoadedModule { // `SignatureToken`, and hence, a single type. single_signature_token_map: BTreeMap, - // a map from signatures in instantiations to the `Vec` that reperesent it. + // a map from signatures in instantiations to the `Vec` that represent it. instantiation_signatures: BTreeMap>, } diff --git a/external-crates/move/crates/move-vm-types/src/natives/function.rs b/external-crates/move/crates/move-vm-types/src/natives/function.rs index 22d45aefb19..6fa4de4620b 100644 --- a/external-crates/move/crates/move-vm-types/src/natives/function.rs +++ b/external-crates/move/crates/move-vm-types/src/natives/function.rs @@ -52,7 +52,7 @@ impl NativeResult { /// Failed execution. The failure is a runtime failure in the function and /// not an invariant failure of the VM which would raise a - /// `PartialVMError` error directly. The only thing the funciton can + /// `PartialVMError` error directly. The only thing the function can /// specify is its abort code, as if it had invoked the `Abort` bytecode /// instruction pub fn err(cost: InternalGas, abort_code: u64) -> Self { diff --git a/external-crates/move/crates/test-generation/src/transitions.rs b/external-crates/move/crates/test-generation/src/transitions.rs index 3d2407d2c17..898b031dda3 100644 --- a/external-crates/move/crates/test-generation/src/transitions.rs +++ b/external-crates/move/crates/test-generation/src/transitions.rs @@ -101,9 +101,9 @@ impl Subst { pub fn abilities_for_token( state: &AbstractState, token: &SignatureToken, - type_paramters: &[AbilitySet], + type_parameters: &[AbilitySet], ) -> AbilitySet { - abilities(&state.module.module, token, type_paramters) + abilities(&state.module.module, token, type_parameters) } /// Given a locals signature index, determine the abilities for each signature diff --git a/external-crates/move/documentation/coding_guidelines.md b/external-crates/move/documentation/coding_guidelines.md index b61341878d8..c44d4393e49 100644 --- a/external-crates/move/documentation/coding_guidelines.md +++ b/external-crates/move/documentation/coding_guidelines.md @@ -7,7 +7,7 @@ This document describes the coding guidelines for the Move Rust codebase. ## Code formatting -All code formatting is enforced with [rustfmt](https://github.com/rust-lang/rustfmt) with a project-specific configuration. Below is an example command to adhere to the Move project conventions. +All code formatting is enforced with [rustfmt](https://github.com/rust-lang/rustfmt) with a project-specific configuration. Below is an example command to adhere to the Move project conventions. ``` $ cargo xfmt @@ -15,27 +15,27 @@ $ cargo xfmt ## Code analysis -[Clippy](https://github.com/rust-lang/rust-clippy) is used to catch common mistakes and is run as a part of continuous integration. Before submitting your code for review, you can run clippy with our configuration: +[Clippy](https://github.com/rust-lang/rust-clippy) is used to catch common mistakes and is run as a part of continuous integration. Before submitting your code for review, you can run clippy with our configuration: ``` $ cargo ci-clippy ``` -In general, we follow the recommendations from [rust-lang-nursery](https://rust-lang.github.io/api-guidelines/) and [The Rust Programming Language](https://doc.rust-lang.org/book/). The remainder of this guide provides detailed guidelines on specific topics in order to achieve uniformity of the codebase. +In general, we follow the recommendations from [rust-lang-nursery](https://rust-lang.github.io/api-guidelines/) and [The Rust Programming Language](https://doc.rust-lang.org/book/). The remainder of this guide provides detailed guidelines on specific topics in order to achieve uniformity of the codebase. ## Code documentation Any public fields, functions, and methods should be documented with [Rustdoc](https://doc.rust-lang.org/book/ch14-02-publishing-to-crates-io.html#making-useful-documentation-comments). - Please follow the conventions as detailed below for modules, structs, enums, and functions. The *single line* is used as a preview when navigating Rustdoc. As an example, see the 'Structs' and 'Enums' sections in the [collections](https://doc.rust-lang.org/std/collections/index.html) Rustdoc. +Please follow the conventions as detailed below for modules, structs, enums, and functions. The _single line_ is used as a preview when navigating Rustdoc. As an example, see the 'Structs' and 'Enums' sections in the [collections](https://doc.rust-lang.org/std/collections/index.html) Rustdoc. - ``` - /// [Single line] One line summary description - /// - /// [Longer description] Multiple lines, inline code - /// examples, invariants, purpose, usage, etc. - [Attributes] If attributes exist, add after Rustdoc - ``` +``` +/// [Single line] One line summary description +/// +/// [Longer description] Multiple lines, inline code +/// examples, invariants, purpose, usage, etc. +[Attributes] If attributes exist, add after Rustdoc +``` Example below: @@ -53,11 +53,12 @@ struct Point { ### Terminology -The Move codebase uses inclusive terminology (similar to other projects such as [the Linux kernel](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49decddd39e5f6132ccd7d9fdc3d7c470b0061bb)). The terms below are recommended when appropriate. -* allowlist - a set of entities allowed access -* blocklist - a set of entities that are blocked from access -* primary/leader/main - a primary entity -* secondary/replica/follower - a secondary entity +The Move codebase uses inclusive terminology (similar to other projects such as [the Linux kernel](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49decddd39e5f6132ccd7d9fdc3d7c470b0061bb)). The terms below are recommended when appropriate. + +- allowlist - a set of entities allowed access +- blocklist - a set of entities that are blocked from access +- primary/leader/main - a primary entity +- secondary/replica/follower - a secondary entity ### Constants and fields @@ -67,12 +68,12 @@ Describe the purpose and definition of this data. If the unit is a measurement o Document the following for each function: -* The action the method performs - “This method *adds* a new transaction to the mempool.” Use *active voice* and *present tense* (i.e. adds/creates/checks/updates/deletes). -* Describe how and why to use this method. -* Any condition that must be met _before_ calling the method. -* State conditions under which the function will `panic!()` or returns an `Error` -* Brief description of return values. -* Any special behavior that is not obvious +- The action the method performs - “This method _adds_ a new transaction to the mempool.” Use _active voice_ and _present tense_ (i.e. adds/creates/checks/updates/deletes). +- Describe how and why to use this method. +- Any condition that must be met _before_ calling the method. +- State conditions under which the function will `panic!()` or returns an `Error` +- Brief description of return values. +- Any special behavior that is not obvious ### README.md for top-level directories and other major components @@ -80,10 +81,10 @@ Each major component of Move needs to have a `README.md` file. This file should contain: - * The *conceptual* *documentation* of the component. - * A link to the external API documentation for the component. - * A link to the main license of the project. - * A link to the main contributing guide for the project. +- The _conceptual_ _documentation_ of the component. +- A link to the external API documentation for the component. +- A link to the main license of the project. +- A link to the main contributing guide for the project. A template for readmes: @@ -94,19 +95,19 @@ A template for readmes: ## Overview -* Describe the purpose of this component and how the code in -this directory works. -* Describe the interaction of the code in this directory with -the other components. -* Describe the security model and assumptions about the crates -in this directory. Examples of how to describe the security -assumptions will be added in the future. +- Describe the purpose of this component and how the code in + this directory works. +- Describe the interaction of the code in this directory with + the other components. +- Describe the security model and assumptions about the crates + in this directory. Examples of how to describe the security + assumptions will be added in the future. ## Implementation Details -* Describe how the component is modeled. For example, why is the - code organized the way it is? -* Other relevant implementation details. +- Describe how the component is modeled. For example, why is the + code organized the way it is? +- Other relevant implementation details. ## Binary, Argument, and Crate Naming @@ -127,14 +128,13 @@ In the following sections, we have suggested some best practices for a uniform c ### Attributes Make sure to use the appropriate attributes for handling dead code: - ``` -// For code that is intended for production usage in the future -#[allow(dead_code)] + +// For code that is intended for production usage in the future #[allow(dead_code)] // For code that is only intended for testing and -// has no intended production use -#[cfg(test)] -``` +// has no intended production use #[cfg(test)] + +```` ### Avoid Deref polymorphism @@ -201,35 +201,35 @@ impl Foo { self.key_to_value.get(&key) } } -``` +```` ### Integer Arithmetic As every integer operation (`+`, `-`, `/`, `*`, etc.) implies edge-cases (e.g. overflows `u64::MAX + 1`, underflows `0u64 -1`, division by zero, etc.), we use checked arithmetic instead of directly using math symbols. -It forces us to think of edge-cases, and handle them explicitely. +It forces us to think of edge-cases, and handle them explicitly. This is a brief and simplified mini guide of the different functions that exist to handle integer arithmetic: -* [checked_](https://doc.rust-lang.org/std/primitive.u32.html#method.checked_add): use this function if you want to handle overflows and underflows as a special edge-case. It returns `None` if an underflow or overflow has happened, and `Some(operation_result)` otherwise. -* [overflowing_](https://doc.rust-lang.org/std/primitive.u32.html#method.overflowing_add): use this function if you want the result of an overflow to potentially wrap around (e.g. `u64::MAX.overflow_add(10) == (9, true)`). It returns the underflowed or overflowed result as well as a flag indicating if an overflow has occured or not. -* [wrapping_](https://doc.rust-lang.org/std/primitive.u32.html#method.wrapping_add): this is similar to overflowing operations, except that it returns the result directly. Use this function if you are sure that you want to handle underflows and overflows by wrapping around. -* [saturating_](https://doc.rust-lang.org/std/primitive.u32.html#method.saturating_add): if an overflow occurs, the result is kept within the boundary of the type (e.g. `u64::MAX.saturating_add(1) == u64::MAX`). +- [checked\_](https://doc.rust-lang.org/std/primitive.u32.html#method.checked_add): use this function if you want to handle overflows and underflows as a special edge-case. It returns `None` if an underflow or overflow has happened, and `Some(operation_result)` otherwise. +- [overflowing\_](https://doc.rust-lang.org/std/primitive.u32.html#method.overflowing_add): use this function if you want the result of an overflow to potentially wrap around (e.g. `u64::MAX.overflow_add(10) == (9, true)`). It returns the underflowed or overflowed result as well as a flag indicating if an overflow has occured or not. +- [wrapping\_](https://doc.rust-lang.org/std/primitive.u32.html#method.wrapping_add): this is similar to overflowing operations, except that it returns the result directly. Use this function if you are sure that you want to handle underflows and overflows by wrapping around. +- [saturating\_](https://doc.rust-lang.org/std/primitive.u32.html#method.saturating_add): if an overflow occurs, the result is kept within the boundary of the type (e.g. `u64::MAX.saturating_add(1) == u64::MAX`). ### Logging We currently use [log](https://docs.rs/log/) for logging. -* [error!](https://docs.rs/log/0.4.14/log/macro.error.html) - Error-level messages have the highest urgency in [log](https://docs.rs/log/). An unexpected error has occurred (e.g. exceeded the maximum number of retries to complete an RPC or inability to store data to local storage). -* [warn!](https://docs.rs/log/0.4.14/log/macro.warn.html) - Warn-level messages help notify admins about automatically handled issues (e.g. retrying a failed network connection or receiving the same message multiple times, etc.). -* [info!](https://docs.rs/log/0.4.14/log/macro.info.html) - Info-level messages are well iotated for "one-time" events (such as logging state on one-time startup and shutdown) or periodic events that are not frequently occurring - e.g. changing the validator set every day. -* [debug!](https://docs.rs/log/0.4.14/log/macro.debug.html) - Debug-level messages can occur frequently (i.e. potentially > 1 message per second) and are not typically expected to be enabled in production. -* [trace!](https://docs.rs/log/0.4.14/log/macro.trace.html) - Trace-level logging is typically only used for function entry/exit. +- [error!](https://docs.rs/log/0.4.14/log/macro.error.html) - Error-level messages have the highest urgency in [log](https://docs.rs/log/). An unexpected error has occurred (e.g. exceeded the maximum number of retries to complete an RPC or inability to store data to local storage). +- [warn!](https://docs.rs/log/0.4.14/log/macro.warn.html) - Warn-level messages help notify admins about automatically handled issues (e.g. retrying a failed network connection or receiving the same message multiple times, etc.). +- [info!](https://docs.rs/log/0.4.14/log/macro.info.html) - Info-level messages are well iotated for "one-time" events (such as logging state on one-time startup and shutdown) or periodic events that are not frequently occurring - e.g. changing the validator set every day. +- [debug!](https://docs.rs/log/0.4.14/log/macro.debug.html) - Debug-level messages can occur frequently (i.e. potentially > 1 message per second) and are not typically expected to be enabled in production. +- [trace!](https://docs.rs/log/0.4.14/log/macro.trace.html) - Trace-level logging is typically only used for function entry/exit. ### Testing -*Unit tests* +_Unit tests_ -We follow the general guidance provided [here](https://doc.rust-lang.org/book/ch11-03-test-organization.html). Ideally, all code should be unit tested. Unit tests should be in the same file as the code it is testing though in a distinct module, using the following syntax: +We follow the general guidance provided [here](https://doc.rust-lang.org/book/ch11-03-test-organization.html). Ideally, all code should be unit tested. Unit tests should be in the same file as the code it is testing though in a distinct module, using the following syntax: ```rust struct Foo { @@ -250,39 +250,40 @@ mod tests { } ``` -*Property-based tests* +_Property-based tests_ -Move contains [property-based tests](https://blog.jessitron.com/2013/04/25/property-based-testing-what-is-it/) written in Rust using the [`proptest` framework](https://github.com/AltSysrq/proptest). Property-based tests generate random test cases and assert that invariants, also called *properties*, hold for the code under test. +Move contains [property-based tests](https://blog.jessitron.com/2013/04/25/property-based-testing-what-is-it/) written in Rust using the [`proptest` framework](https://github.com/AltSysrq/proptest). Property-based tests generate random test cases and assert that invariants, also called _properties_, hold for the code under test. Some examples of properties tested in Move: -* Every serializer and deserializer pair is tested for correctness with random inputs to the serializer. Any pair of functions that are inverses of each other can be tested this way. -* The results of executing common transactions through the VM are tested using randomly generated scenarios and verified with an *Oracle*. +- Every serializer and deserializer pair is tested for correctness with random inputs to the serializer. Any pair of functions that are inverses of each other can be tested this way. +- The results of executing common transactions through the VM are tested using randomly generated scenarios and verified with an _Oracle_. A tutorial for `proptest` can be found in the [`proptest` book](https://altsysrq.github.io/proptest-book/proptest/getting-started.html). References: -* [What is Property Based Testing?](https://hypothesis.works/articles/what-is-property-based-testing/) (includes a comparison with fuzzing) -* [An introduction to property-based testing](https://fsharpforfunandprofit.com/posts/property-based-testing/) -* [Choosing properties for property-based testing](https://fsharpforfunandprofit.com/posts/property-based-testing-2/) +- [What is Property Based Testing?](https://hypothesis.works/articles/what-is-property-based-testing/) (includes a comparison with fuzzing) +- [An introduction to property-based testing](https://fsharpforfunandprofit.com/posts/property-based-testing/) +- [Choosing properties for property-based testing](https://fsharpforfunandprofit.com/posts/property-based-testing-2/) ### Conditional compilation of tests Move [conditionally compiles](https://doc.rust-lang.org/stable/reference/conditional-compilation.html) -code that is *only relevant for tests, but does not consist of tests* (unitary +code that is _only relevant for tests, but does not consist of tests_ (unitary or otherwise). Examples of this include proptest strategies, implementations and derivations of specific traits (e.g. the occasional `Clone`), helper functions, etc. Since Cargo is [currently not equipped for automatically activating features in tests/benchmarks](https://github.com/rust-lang/cargo/issues/2911), we rely on two conditions to perform this conditional compilation: -- the test flag, which is activated by dependent test code in the same crate - as the conditional test-only code. -- the `fuzzing` custom feature, which is used to enable fuzzing and testing -related code in downstream crates. Note that this must be passed explicitly to -`cargo xtest` and `cargo x bench`. Never use this in `[dependencies]` unless -the crate is only for testing. + +- the test flag, which is activated by dependent test code in the same crate + as the conditional test-only code. +- the `fuzzing` custom feature, which is used to enable fuzzing and testing + related code in downstream crates. Note that this must be passed explicitly to + `cargo xtest` and `cargo x bench`. Never use this in `[dependencies]` unless + the crate is only for testing. As a consequence, it is recommended that you set up your test-only code in the following fashion. @@ -330,14 +331,14 @@ directly. foo_crate = { path = "...", features = ["fuzzing"] } ``` -*A final note on integration tests*: All tests that use conditional test-only +_A final note on integration tests_: All tests that use conditional test-only elements in another crate need to activate the "fuzzing" feature through the `[features]` section in their `Cargo.toml`. [Integration tests](https://doc.rust-lang.org/rust-by-example/testing/integration_testing.html) can neither rely on the `test` flag nor do they have a proper `Cargo.toml` for feature activation. In the Move codebase, we therefore recommend that -*integration tests which depend on test-only code in their tested crate* be +_integration tests which depend on test-only code in their tested crate_ be extracted to their own test-only crate. See `language/move-binary-format/serializer_tests` for an example of such an extracted integration test. -*Note for developers*: The reason we use a feature re-export (in the `[features]` section of the `Cargo.toml` is that a profile is not enough to activate the `"fuzzing"` feature flag. See [cargo-issue #291](https://github.com/rust-lang/cargo/issues/2911) for details). +_Note for developers_: The reason we use a feature re-export (in the `[features]` section of the `Cargo.toml` is that a profile is not enough to activate the `"fuzzing"` feature flag. See [cargo-issue #291](https://github.com/rust-lang/cargo/issues/2911) for details). diff --git a/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/check_duplication.rs b/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/check_duplication.rs index 427dd3963b7..d4f6fac5b4a 100644 --- a/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/check_duplication.rs +++ b/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/check_duplication.rs @@ -51,7 +51,7 @@ impl<'a> DuplicationChecker<'a> { let checker = Self { module }; checker.check_field_handles()?; checker.check_field_instantiations()?; - checker.check_function_defintions()?; + checker.check_function_definitions()?; checker.check_struct_definitions()?; checker.check_struct_instantiations() } @@ -263,7 +263,7 @@ impl<'a> DuplicationChecker<'a> { Ok(()) } - fn check_function_defintions(&self) -> PartialVMResult<()> { + fn check_function_definitions(&self) -> PartialVMResult<()> { // FunctionDefinition - contained FunctionHandle defines uniqueness if let Some(idx) = Self::first_duplicate_element(self.module.function_defs().iter().map(|x| x.function)) diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/loader.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/loader.rs index 1fcde70c640..9ad91629014 100644 --- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/loader.rs +++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/loader.rs @@ -1610,7 +1610,7 @@ pub(crate) struct LoadedModule { // `SignatureToken`, and hence, a single type. single_signature_token_map: BTreeMap, - // a map from signatures in instantiations to the `Vec` that reperesent it. + // a map from signatures in instantiations to the `Vec` that represent it. instantiation_signatures: BTreeMap>, } diff --git a/iota-execution/latest/iota-adapter/src/programmable_transactions/context.rs b/iota-execution/latest/iota-adapter/src/programmable_transactions/context.rs index e7957b7a871..6986ff6966d 100644 --- a/iota-execution/latest/iota-adapter/src/programmable_transactions/context.rs +++ b/iota-execution/latest/iota-adapter/src/programmable_transactions/context.rs @@ -1535,7 +1535,7 @@ mod checked { } fn publish_module(&mut self, _module_id: &ModuleId, _blob: Vec) -> VMResult<()> { - // we cannot panic here because during executon and publishing this is + // we cannot panic here because during execution and publishing this is // currently called from the publish flow in the Move runtime Ok(()) } diff --git a/iota-execution/latest/iota-adapter/src/programmable_transactions/execution.rs b/iota-execution/latest/iota-adapter/src/programmable_transactions/execution.rs index ef294e5fac5..dd68d2fbe3d 100644 --- a/iota-execution/latest/iota-adapter/src/programmable_transactions/execution.rs +++ b/iota-execution/latest/iota-adapter/src/programmable_transactions/execution.rs @@ -499,7 +499,7 @@ mod checked { let package = context.new_package(&modules, dependencies.iter().map(|p| p.move_package()))?; - // Here we optimistacally push the package that is being published/upgraded + // Here we optimistically push the package that is being published/upgraded // and if there is an error of any kind (verification or module init) we // remove it. // The call to `pop_last_package` later is fine because we cannot re-enter and diff --git a/iota-execution/latest/iota-move-natives/src/lib.rs b/iota-execution/latest/iota-move-natives/src/lib.rs index 4e3913821ae..fe420d5def3 100644 --- a/iota-execution/latest/iota-move-natives/src/lib.rs +++ b/iota-execution/latest/iota-move-natives/src/lib.rs @@ -929,7 +929,7 @@ pub fn get_object_id(object: Value) -> Result { get_nested_struct_field(object, &[0, 0, 0]) } -// Extract a field valye that's nested inside value `v`. The offset of each +// Extract a field value that's nested inside value `v`. The offset of each // nesting is determined by `offsets`. pub fn get_nested_struct_field(mut v: Value, offsets: &[usize]) -> Result { for offset in offsets { diff --git a/iota-execution/v0/iota-adapter/src/programmable_transactions/context.rs b/iota-execution/v0/iota-adapter/src/programmable_transactions/context.rs index e7957b7a871..6986ff6966d 100644 --- a/iota-execution/v0/iota-adapter/src/programmable_transactions/context.rs +++ b/iota-execution/v0/iota-adapter/src/programmable_transactions/context.rs @@ -1535,7 +1535,7 @@ mod checked { } fn publish_module(&mut self, _module_id: &ModuleId, _blob: Vec) -> VMResult<()> { - // we cannot panic here because during executon and publishing this is + // we cannot panic here because during execution and publishing this is // currently called from the publish flow in the Move runtime Ok(()) } diff --git a/iota-execution/v0/iota-adapter/src/programmable_transactions/execution.rs b/iota-execution/v0/iota-adapter/src/programmable_transactions/execution.rs index ef294e5fac5..dd68d2fbe3d 100644 --- a/iota-execution/v0/iota-adapter/src/programmable_transactions/execution.rs +++ b/iota-execution/v0/iota-adapter/src/programmable_transactions/execution.rs @@ -499,7 +499,7 @@ mod checked { let package = context.new_package(&modules, dependencies.iter().map(|p| p.move_package()))?; - // Here we optimistacally push the package that is being published/upgraded + // Here we optimistically push the package that is being published/upgraded // and if there is an error of any kind (verification or module init) we // remove it. // The call to `pop_last_package` later is fine because we cannot re-enter and diff --git a/iota-execution/v0/iota-move-natives/src/lib.rs b/iota-execution/v0/iota-move-natives/src/lib.rs index 4e3913821ae..fe420d5def3 100644 --- a/iota-execution/v0/iota-move-natives/src/lib.rs +++ b/iota-execution/v0/iota-move-natives/src/lib.rs @@ -929,7 +929,7 @@ pub fn get_object_id(object: Value) -> Result { get_nested_struct_field(object, &[0, 0, 0]) } -// Extract a field valye that's nested inside value `v`. The offset of each +// Extract a field value that's nested inside value `v`. The offset of each // nesting is determined by `offsets`. pub fn get_nested_struct_field(mut v: Value, offsets: &[usize]) -> Result { for offset in offsets { diff --git a/scripts/rename-to-iota/rename.py b/scripts/rename-to-iota/rename.py index bd3b850ad84..c39ce02d8c6 100755 --- a/scripts/rename-to-iota/rename.py +++ b/scripts/rename-to-iota/rename.py @@ -277,7 +277,7 @@ def main(): parser.add_argument('--path', '-p', help='The path of the folder to process, defaults to the main folder of the project if left out') parser.add_argument('--execute', action='store_true', default=False, help='Flag to execute the replacements, if omitted it will just be a dry-run') parser.add_argument('--respect-gitignore', action='store_true', default=True, help='Respect what is set in .gitignore to be ignored, defaults to True') - parser.add_argument('--skip-filemod', action='store_true', default=False, help='Skip file modifcation and only do the rename part') + parser.add_argument('--skip-filemod', action='store_true', default=False, help='Skip file modification and only do the rename part') parser.add_argument('--use-git-mv', action='store_true', default=False, help='Use git mv instead of a normal mv, for same repo modifications') args = parser.parse_args() diff --git a/sdk/bcs/CHANGELOG.md b/sdk/bcs/CHANGELOG.md index bce23578078..8cbfeb1e135 100644 --- a/sdk/bcs/CHANGELOG.md +++ b/sdk/bcs/CHANGELOG.md @@ -104,7 +104,7 @@ Similar approach applies to `bcs.ser()` and `bcs.de()` as well as to other register\* methods - a0955c479: Switch from 20 to 32-byte address. Match Secp256k1.deriveKeypair with Ed25519. -- 0a7b42a6d: This changes almost all occurences of "delegate", "delegation" (and various capitalizations/forms) to their equivalent "stake"-based name. Function names, function argument names, RPC endpoints, Move functions, and object fields have been updated with this new naming convention. +- 0a7b42a6d: This changes almost all occurrences of "delegate", "delegation" (and various capitalizations/forms) to their equivalent "stake"-based name. Function names, function argument names, RPC endpoints, Move functions, and object fields have been updated with this new naming convention. - 77bdf907f: When parsing u64, u128, and u256 values with bcs, they are now string encoded. ## 0.6.1 diff --git a/sdk/ledgerjs-hw-app-iota/CHANGELOG.md b/sdk/ledgerjs-hw-app-iota/CHANGELOG.md index 7cb22055774..dcb03d12d6e 100644 --- a/sdk/ledgerjs-hw-app-iota/CHANGELOG.md +++ b/sdk/ledgerjs-hw-app-iota/CHANGELOG.md @@ -23,5 +23,5 @@ ### Minor Changes - a6690ac7d: Changed the default behavior of `publish` to publish an upgreadeable-by-sender package instead of immutable. -- 0a7b42a6d: This changes almost all occurences of "delegate", "delegation" (and various capitalizations/forms) to their equivalent "stake"-based name. Function names, function argument names, RPC endpoints, Move functions, and object fields have been updated with this new naming convention. +- 0a7b42a6d: This changes almost all occurrences of "delegate", "delegation" (and various capitalizations/forms) to their equivalent "stake"-based name. Function names, function argument names, RPC endpoints, Move functions, and object fields have been updated with this new naming convention. - 3709957cf: Published initial version of library diff --git a/sdk/typescript/CHANGELOG.md b/sdk/typescript/CHANGELOG.md index 73a8e538685..d93d49f680a 100644 --- a/sdk/typescript/CHANGELOG.md +++ b/sdk/typescript/CHANGELOG.md @@ -178,7 +178,7 @@ - Added pure helpers (`txb.pure.address()`, `txb.bool()`, and `txb.pure.u{8-256}()`) to simplify serialization of pure values - Deprecated using `txb.pure` with raw JavaScript values, or an explicit type argument. -- 1bc430161: Updated BCS defintions to use new BCS schema builder +- 1bc430161: Updated BCS definitions to use new BCS schema builder ### Patch Changes @@ -534,7 +534,7 @@ - a0955c479: Switch from 20 to 32-byte address. Match Secp256k1.deriveKeypair with Ed25519. - 0c9047698: Remove all gas selection APIs from the json rpc provider. - d5ef1b6e5: Added dependencies to publish command, dependencies now also returned from the iota move CLI with the `--dump-bytecode-as-base64` flag -- 0a7b42a6d: This changes almost all occurences of "delegate", "delegation" (and various capitalizations/forms) to their equivalent "stake"-based name. Function names, function argument names, RPC endpoints, Move functions, and object fields have been updated with this new naming convention. +- 0a7b42a6d: This changes almost all occurrences of "delegate", "delegation" (and various capitalizations/forms) to their equivalent "stake"-based name. Function names, function argument names, RPC endpoints, Move functions, and object fields have been updated with this new naming convention. - 3de8de361: Remove `getValidators` API. Use `getLatestIotaSystemState` instead. - dd348cf03: Refactor `getTransactions` to `queryTransactions` - 57c17e02a: Removed `JsonRpcProviderWithCache`, use `JsonRpcProvider` instead. @@ -543,7 +543,7 @@ - fe335e6ba: Removed usage of `cross-fetch` in the TypeScript SDK. If you are running in an environment that does not have `fetch` defined, you will need to polyfill it. - 5dc25faad: Remove getTransactionDigestsInRange from the SDK - 64234baaf: added combined `getCheckpoint` endpoint for retrieving information about a checkpoint -- d3170ba41: All JSON-RPC APIs now accept objects instead of positional arugments. +- d3170ba41: All JSON-RPC APIs now accept objects instead of positional arguments. - a6ffb8088: Removed events from transaction effects, TransactionEvents will now be provided in the TransactionResponse, along side TransactionEffects. - 3304eb83b: Refactor Rust IotaTransactionBlockKind to be internally tagged for Json serialization with tag="type" and IotaEvent to be adjacently tagged with tag="type" and content="content" - 4189171ef: Adds support for validator candidate. @@ -704,7 +704,7 @@ - renames `newTransferTx` function from framework Coin to `newPayTransaction`. Also it's now a public method and without the need of signer so a dapp can use it - fixes edge cases with pay txs - bb14ffdc5: Remove ImmediateReturn and WaitForTxCert from ExecuteTransactionRequestType -- d2015f815: Rebuilt type-narrowing utilties (e.g. `isIotaObject`) on top of Superstruct, which should make them more reliable. +- d2015f815: Rebuilt type-narrowing utilities (e.g. `isIotaObject`) on top of Superstruct, which should make them more reliable. The type-narrowing functions are no longer exported, instead a Superstruct schema is exported, in addition to an `is` and `assert` function, both of which can be used to replace the previous narrowing functions. For example, `isIotaObject(data)` becomes `is(data, IotaObject)`. - 7d0f25b61: Add devInspectTransaction, which is similar to dryRunTransaction, but lets you call any Move function(including non-entry function) with arbitrary values. diff --git a/sdk/typescript/src/transactions/__tests__/Transaction.test.ts b/sdk/typescript/src/transactions/__tests__/Transaction.test.ts index ab1f1730734..0b9688c4689 100644 --- a/sdk/typescript/src/transactions/__tests__/Transaction.test.ts +++ b/sdk/typescript/src/transactions/__tests__/Transaction.test.ts @@ -9,7 +9,7 @@ import { bcs } from '../../bcs/index.js'; import { TransactionBlock, Transactions } from '../index.js'; import { Inputs } from '../Inputs.js'; -it('can construct and serialize an empty tranaction', () => { +it('can construct and serialize an empty transaction', () => { const tx = new TransactionBlock(); expect(() => tx.serialize()).not.toThrow(); }); diff --git a/sdk/wallet-standard/CHANGELOG.md b/sdk/wallet-standard/CHANGELOG.md index 4671f448413..e3d9784512c 100644 --- a/sdk/wallet-standard/CHANGELOG.md +++ b/sdk/wallet-standard/CHANGELOG.md @@ -366,7 +366,7 @@ - 3d9a04648: Adds `deactivation_epoch` to staking pool object, and adds `inactive_pools` to the validator set object. - da72e73a9: Change the address of Move package for staking and validator related Move modules. - 0672b5990: The Wallet Standard now only supports the `Transaction` type, instead of the previous `SignableTransaction` type. -- 0a7b42a6d: This changes almost all occurences of "delegate", "delegation" (and various capitalizations/forms) to their equivalent "stake"-based name. Function names, function argument names, RPC endpoints, Move functions, and object fields have been updated with this new naming convention. +- 0a7b42a6d: This changes almost all occurrences of "delegate", "delegation" (and various capitalizations/forms) to their equivalent "stake"-based name. Function names, function argument names, RPC endpoints, Move functions, and object fields have been updated with this new naming convention. - c718deef4: wallet-standard: changes iota:signAndExecuteTransaction and iota:signTransaction features to support account and chain options wallet-adapter-wallet-standard: change signAndExecuteTransaction and signTransaction signatures to support account and chain options wallet-adapter-wallet-standard: ensure version compatibility for of the wallet signAndExecuteTransaction and signTransaction features before using them (same major version) From 85a61ec9c46cf31665ae3c33a17f66ae67a3c883 Mon Sep 17 00:00:00 2001 From: Thoralf-M <46689931+Thoralf-M@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:08:19 +0200 Subject: [PATCH 2/2] fix(iota): fix table alignment, clippy (#917) * fix(iota): fix table alignment, clippy * More clippy * Even more clippy, update wasm-bindgen: the following packages contain code that will be rejected by a future version of Rust: wasm-bindgen v0.2.87 * Use cfg(test) instead of allow(dead_code) --------- Co-authored-by: DaughterOfMars --- crates/iota-config/src/node.rs | 1 - crates/iota-core/src/authority.rs | 4 +-- .../src/authority/test_authority_builder.rs | 5 +--- crates/iota-core/src/transaction_manager.rs | 2 ++ .../iota-graphql-rpc/src/types/move_object.rs | 1 + crates/iota-graphql-rpc/src/types/object.rs | 1 + crates/iota-graphql-rpc/src/types/owner.rs | 1 + .../src/iota_transaction.rs | 2 +- .../src/payload/query_transactions.rs | 2 +- .../iota-storage/src/http_key_value_store.rs | 7 +---- .../src/simulator_persisted_store.rs | 16 +++--------- crates/iota/src/main.rs | 1 + ..._files_tests__whitespace_handling.ptb.snap | 26 +++++++++---------- crates/iotaop-cli/src/command.rs | 6 +---- crates/telemetry-subscribers/src/lib.rs | 2 +- crates/typed-store/src/rocks/mod.rs | 2 +- narwhal/storage/src/certificate_store.rs | 10 +++---- narwhal/worker/src/handlers.rs | 2 ++ sdk/move-bytecode-template/Cargo.lock | 20 +++++++------- sdk/move-bytecode-template/Cargo.toml | 2 +- 20 files changed, 48 insertions(+), 65 deletions(-) diff --git a/crates/iota-config/src/node.rs b/crates/iota-config/src/node.rs index 8cdadcc76af..b3ecef25370 100644 --- a/crates/iota-config/src/node.rs +++ b/crates/iota-config/src/node.rs @@ -8,7 +8,6 @@ use std::{ path::{Path, PathBuf}, sync::Arc, time::Duration, - usize, }; use anyhow::Result; diff --git a/crates/iota-core/src/authority.rs b/crates/iota-core/src/authority.rs index 44d75f7769f..7a867e12274 100644 --- a/crates/iota-core/src/authority.rs +++ b/crates/iota-core/src/authority.rs @@ -3566,12 +3566,12 @@ impl AuthorityState { .rev() .skip_while(|d| cursor.is_some() && Some(*d) != cursor) .skip(usize::from(cursor.is_some())); - return Ok(iter.take(limit.unwrap_or(usize::max_value())).collect()); + return Ok(iter.take(limit.unwrap_or(usize::MAX)).collect()); } else { let iter = iter .skip_while(|d| cursor.is_some() && Some(*d) != cursor) .skip(usize::from(cursor.is_some())); - return Ok(iter.take(limit.unwrap_or(usize::max_value())).collect()); + return Ok(iter.take(limit.unwrap_or(usize::MAX)).collect()); } } self.get_indexes()? diff --git a/crates/iota-core/src/authority/test_authority_builder.rs b/crates/iota-core/src/authority/test_authority_builder.rs index da3f2b18d8e..0f411d826f2 100644 --- a/crates/iota-core/src/authority/test_authority_builder.rs +++ b/crates/iota-core/src/authority/test_authority_builder.rs @@ -223,10 +223,7 @@ impl<'a> TestAuthorityBuilder<'a> { None, ) .unwrap(); - let expensive_safety_checks = match self.expensive_safety_checks { - None => ExpensiveSafetyCheckConfig::default(), - Some(config) => config, - }; + let expensive_safety_checks = self.expensive_safety_checks.unwrap_or_default(); let cache = Arc::new(ExecutionCache::new_for_tests( authority_store.clone(), ®istry, diff --git a/crates/iota-core/src/transaction_manager.rs b/crates/iota-core/src/transaction_manager.rs index debf136ef28..b8fc4a6963b 100644 --- a/crates/iota-core/src/transaction_manager.rs +++ b/crates/iota-core/src/transaction_manager.rs @@ -68,6 +68,7 @@ pub struct TransactionManager { #[derive(Clone, Debug)] pub struct PendingCertificateStats { // The time this certificate enters transaction manager. + #[cfg(test)] pub enqueue_time: Instant, // The time this certificate becomes ready for execution. pub ready_time: Option, @@ -554,6 +555,7 @@ impl TransactionManager { expected_effects_digest, waiting_input_objects: input_object_keys, stats: PendingCertificateStats { + #[cfg(test)] enqueue_time: pending_cert_enqueue_time, ready_time: None, }, diff --git a/crates/iota-graphql-rpc/src/types/move_object.rs b/crates/iota-graphql-rpc/src/types/move_object.rs index cafc12eff87..fe4ad9fbf20 100644 --- a/crates/iota-graphql-rpc/src/types/move_object.rs +++ b/crates/iota-graphql-rpc/src/types/move_object.rs @@ -50,6 +50,7 @@ pub(crate) enum MoveObjectDowncastError { /// This interface is implemented by types that represent a Move object on-chain /// (A Move value whose type has `key`). +#[allow(clippy::duplicated_attributes)] #[derive(Interface)] #[graphql( name = "IMoveObject", diff --git a/crates/iota-graphql-rpc/src/types/object.rs b/crates/iota-graphql-rpc/src/types/object.rs index 3e550d1ca00..14e65a3f0ae 100644 --- a/crates/iota-graphql-rpc/src/types/object.rs +++ b/crates/iota-graphql-rpc/src/types/object.rs @@ -227,6 +227,7 @@ pub(crate) struct HistoricalObjectCursor { /// Interface implemented by on-chain values that are addressable by an ID (also /// referred to as its address). This includes Move objects and packages. +#[allow(clippy::duplicated_attributes)] #[derive(Interface)] #[graphql( name = "IObject", diff --git a/crates/iota-graphql-rpc/src/types/owner.rs b/crates/iota-graphql-rpc/src/types/owner.rs index 4b24775b561..136ebef4357 100644 --- a/crates/iota-graphql-rpc/src/types/owner.rs +++ b/crates/iota-graphql-rpc/src/types/owner.rs @@ -49,6 +49,7 @@ pub(crate) struct OwnerImpl { /// either the public key of an account or another object. The same address can /// only refer to an account or an object, never both, but it is not possible to /// know which up-front. +#[allow(clippy::duplicated_attributes)] #[derive(Interface)] #[graphql( name = "IOwner", diff --git a/crates/iota-json-rpc-types/src/iota_transaction.rs b/crates/iota-json-rpc-types/src/iota_transaction.rs index 4788d5e7662..bdeb30749d5 100644 --- a/crates/iota-json-rpc-types/src/iota_transaction.rs +++ b/crates/iota-json-rpc-types/src/iota_transaction.rs @@ -1595,7 +1595,7 @@ impl IotaProgrammableTransactionBlock { } fn resolve_input_type( - inputs: &Vec, + inputs: &[CallArg], commands: &[Command], module_cache: &impl GetModule, ) -> Vec> { diff --git a/crates/iota-rpc-loadgen/src/payload/query_transactions.rs b/crates/iota-rpc-loadgen/src/payload/query_transactions.rs index 0715c75bd2f..834fc7d7f7a 100644 --- a/crates/iota-rpc-loadgen/src/payload/query_transactions.rs +++ b/crates/iota-rpc-loadgen/src/payload/query_transactions.rs @@ -86,7 +86,7 @@ impl<'a> ProcessPayload<'a, &'a QueryTransactionBlocks> for RpcCommandProcessor } }; - results = join_all(clients.iter().enumerate().map(|(_i, client)| { + results = join_all(clients.iter().map(|client| { let with_query = query.clone(); async move { query_transaction_blocks(client, with_query, cursor, None) diff --git a/crates/iota-storage/src/http_key_value_store.rs b/crates/iota-storage/src/http_key_value_store.rs index c0c48fb59ed..f5eebdb174d 100644 --- a/crates/iota-storage/src/http_key_value_store.rs +++ b/crates/iota-storage/src/http_key_value_store.rs @@ -165,12 +165,7 @@ impl HttpKVStore { async fn multi_fetch(&self, uris: Vec) -> Vec>> { let uris_vec = uris.to_vec(); - let fetches = stream::iter( - uris_vec - .into_iter() - .enumerate() - .map(|(_i, uri)| self.fetch(uri)), - ); + let fetches = stream::iter(uris_vec.into_iter().map(|uri| self.fetch(uri))); fetches.buffered(uris.len()).collect::>().await } diff --git a/crates/iota-transactional-test-runner/src/simulator_persisted_store.rs b/crates/iota-transactional-test-runner/src/simulator_persisted_store.rs index 1a1d47d4cde..24cdef90ae9 100644 --- a/crates/iota-transactional-test-runner/src/simulator_persisted_store.rs +++ b/crates/iota-transactional-test-runner/src/simulator_persisted_store.rs @@ -310,16 +310,12 @@ impl SimulatorStore for PersistedStore { fn insert_committee(&mut self, committee: Committee) { let epoch = committee.epoch as usize; - let mut committees = if let Some(c) = self + let mut committees = self .read_write .epoch_to_committee .get(&()) .expect("Fatal: DB read failed") - { - c - } else { - vec![] - }; + .unwrap_or_default(); if committees.get(epoch).is_some() { return; @@ -394,16 +390,12 @@ impl SimulatorStore for PersistedStore { .live_objects .insert(&object_id, &version) .expect("Fatal: DB write failed"); - let mut q = if let Some(x) = self + let mut q = self .read_write .objects .get(&object_id) .expect("Fatal: DB read failed") - { - x - } else { - BTreeMap::new() - }; + .unwrap_or_default(); q.insert(version, object); self.read_write .objects diff --git a/crates/iota/src/main.rs b/crates/iota/src/main.rs index 167c9cd91cf..8ccf9286351 100644 --- a/crates/iota/src/main.rs +++ b/crates/iota/src/main.rs @@ -24,6 +24,7 @@ const GIT_REVISION: &str = { }; const VERSION: &str = { + #[allow(clippy::const_is_empty)] if GIT_REVISION.is_empty() { env!("CARGO_PKG_VERSION") } else { diff --git a/crates/iota/tests/snapshots/ptb_files_tests__whitespace_handling.ptb.snap b/crates/iota/tests/snapshots/ptb_files_tests__whitespace_handling.ptb.snap index 0901ed4abec..e2612b80b62 100644 --- a/crates/iota/tests/snapshots/ptb_files_tests__whitespace_handling.ptb.snap +++ b/crates/iota/tests/snapshots/ptb_files_tests__whitespace_handling.ptb.snap @@ -3,22 +3,22 @@ source: crates/iota/tests/ptb_files_tests.rs expression: "results.join(\"\\n\")" --- === PREVIEW === -╭─────────────────────────────────────────────────────────────────────────────────────────────────────────╮ -│ PTB Preview │ -├───────────────┬─────────────────────────────────────────────────────────────────────────────────────────┤ -│ command │ values │ -├───────────────┼─────────────────────────────────────────────────────────────────────────────────────────┤ -│ assign │ x vector[1u64, 2u64, 3u64, 4u64] │ -│ assign │ x vector[1u64, 2u64, 3u64, 4u64] │ -│ assign │ x vector["1", "2, 3", "", "4 "] │ -│ assign │ x vector["1", "2, 3", "", "4 \n "] │ -│ make-move-vec │ [1u64, 2u64, 3u64, 4u64] │ +╭──────────────────────────────────────────────────────────────────────────────────────────────────────────╮ +│ PTB Preview │ +├───────────────┬──────────────────────────────────────────────────────────────────────────────────────────┤ +│ command │ values │ +├───────────────┼──────────────────────────────────────────────────────────────────────────────────────────┤ +│ assign │ x vector[1u64, 2u64, 3u64, 4u64] │ +│ assign │ x vector[1u64, 2u64, 3u64, 4u64] │ +│ assign │ x vector["1", "2, 3", "", "4 "] │ +│ assign │ x vector["1", "2, 3", "", "4 \n "] │ +│ make-move-vec │ [1u64, 2u64, 3u64, 4u64] │ │ make-move-vec │ [1u64, 2u64, 3u64, 4u64] │ │ make-move-vec │ ["1", "2, 3", "", "4 "] │ │ make-move-vec │ ["1", "2, 3", "", "4 \n "] │ -├───────────────┼─────────────────────────────────────────────────────────────────────────────────────────┤ -│ gas-budget │ 100 │ -╰───────────────┴─────────────────────────────────────────────────────────────────────────────────────────╯ +├───────────────┼──────────────────────────────────────────────────────────────────────────────────────────┤ +│ gas-budget │ 100 │ +╰───────────────┴──────────────────────────────────────────────────────────────────────────────────────────╯ === BUILT PTB === Input 0: Pure([1, 0, 0, 0, 0, 0, 0, 0]) Input 1: Pure([2, 0, 0, 0, 0, 0, 0, 0]) diff --git a/crates/iotaop-cli/src/command.rs b/crates/iotaop-cli/src/command.rs index a1d3efbc09d..2fdbea204c9 100644 --- a/crates/iotaop-cli/src/command.rs +++ b/crates/iotaop-cli/src/command.rs @@ -35,11 +35,7 @@ impl Default for CommandOptions { pub fn run_cmd(cmd_in: Vec<&str>, options: Option) -> Result { debug!("attempting to run {}", cmd_in.join(" ")); - let opts = if let Some(opts) = options { - opts - } else { - CommandOptions::default() - }; + let opts = options.unwrap_or_default(); let mut cmd = Command::new(cmd_in[0]); // add extra args diff --git a/crates/telemetry-subscribers/src/lib.rs b/crates/telemetry-subscribers/src/lib.rs index 036a93fa47b..b1b954facf0 100644 --- a/crates/telemetry-subscribers/src/lib.rs +++ b/crates/telemetry-subscribers/src/lib.rs @@ -505,7 +505,7 @@ impl SamplingFilter { fn clamp(sample_rate: f64) -> f64 { // clamp sample rate to between 0.0001 and 1.0 - sample_rate.max(0.0001).min(1.0) + sample_rate.clamp(0.0001, 1.0) } fn update_sampling_rate(&self, sample_rate: f64) { diff --git a/crates/typed-store/src/rocks/mod.rs b/crates/typed-store/src/rocks/mod.rs index c52a2b6e70c..e01cfc14e30 100644 --- a/crates/typed-store/src/rocks/mod.rs +++ b/crates/typed-store/src/rocks/mod.rs @@ -2726,7 +2726,7 @@ fn populate_missing_cfs( /// Given a vec, find the value which is one more than the vector /// if the vector was a big endian number. /// If the vector is already minimum, don't change it. -fn big_endian_saturating_add_one(v: &mut Vec) { +fn big_endian_saturating_add_one(v: &mut [u8]) { if is_max(v) { return; } diff --git a/narwhal/storage/src/certificate_store.rs b/narwhal/storage/src/certificate_store.rs index 2d478a4a374..87d7e17e277 100644 --- a/narwhal/storage/src/certificate_store.rs +++ b/narwhal/storage/src/certificate_store.rs @@ -612,17 +612,13 @@ impl CertificateStore { /// Retrieves the highest round number in the store. /// Returns 0 if there is no certificate in the store. pub fn highest_round_number(&self) -> Round { - if let Some(((round, _), _)) = self - .certificate_id_by_round + self.certificate_id_by_round .unbounded_iter() .skip_to_last() .reverse() .next() - { - round - } else { - 0 - } + .map(|((round, _), _)| round) + .unwrap_or_default() } /// Retrieves the last round number of the given origin. diff --git a/narwhal/worker/src/handlers.rs b/narwhal/worker/src/handlers.rs index 622d7f28692..d1710f84811 100644 --- a/narwhal/worker/src/handlers.rs +++ b/narwhal/worker/src/handlers.rs @@ -116,6 +116,7 @@ impl WorkerToWorker for WorkerReceiverHandler { /// Defines how the network receiver handles incoming primary messages. pub struct PrimaryReceiverHandler { // The id of this authority. + #[allow(dead_code)] pub authority_id: AuthorityIdentifier, // The id of this worker. pub id: WorkerId, @@ -129,6 +130,7 @@ pub struct PrimaryReceiverHandler { // Timeout on RequestBatches RPC. pub request_batches_timeout: Duration, // Number of random nodes to query when retrying batch requests. + #[allow(dead_code)] pub request_batches_retry_nodes: usize, // Synchronize header payloads from other workers. pub network: Option, diff --git a/sdk/move-bytecode-template/Cargo.lock b/sdk/move-bytecode-template/Cargo.lock index a682fedca38..bb9e50dc2dd 100644 --- a/sdk/move-bytecode-template/Cargo.lock +++ b/sdk/move-bytecode-template/Cargo.lock @@ -684,9 +684,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -694,9 +694,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -709,9 +709,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -719,9 +719,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -732,9 +732,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "winnow" diff --git a/sdk/move-bytecode-template/Cargo.toml b/sdk/move-bytecode-template/Cargo.toml index b06d2fe3f58..752f67ed1dd 100644 --- a/sdk/move-bytecode-template/Cargo.toml +++ b/sdk/move-bytecode-template/Cargo.toml @@ -15,7 +15,7 @@ move-core-types = { path = "../../external-crates/move/crates/move-core-types", serde = { version = "1.0.124", default-features = false } serde-wasm-bindgen = "0.5.0" serde_json = "1.0.64" -wasm-bindgen = "0.2.62" +wasm-bindgen = "0.2.92" [lib] crate-type = ["cdylib"]