Merge branch 'master' into sophie/remove-plugin-path-warning

.github/workflows/local-testnode/state_config.json

@@ -5,7 +5,7 @@
       "output_index": 0,
       "tx_pointer_block_height": 0,
       "tx_pointer_tx_idx": 0,
-      "owner": "6b63804cfbf9856e68e5b6e7aef238dc8311ec55bec04df774003a2c96e0418e",
+      "owner": "de97d8624a438121b86a1956544bd72ed68cd69f2c99555b08b1e8c51ffd511c",
       "amount": 1152921504606846976,
       "asset_id": "0000000000000000000000000000000000000000000000000000000000000000"
     },

forc-pkg/src/pkg.rs

@@ -2230,7 +2230,7 @@ pub fn contract_id(
     contract.id(salt, &contract.root(), &state_root)
 }
 
-/// Checks if there are conficting `Salt` declarations for the contract dependencies in the graph.
+/// Checks if there are conflicting `Salt` declarations for the contract dependencies in the graph.
 fn validate_contract_deps(graph: &Graph) -> Result<()> {
     // For each contract dependency node in the graph, check if there are conflicting salt
     // declarations.

forc-plugins/forc-client/src/util/tx.rs

@@ -257,7 +257,7 @@ impl<Tx: Buildable + field::Witnesses + Send> TransactionBuilderExt<Tx> for Tran
                         }
                     })?;
 
-                // TODO: Do this via forc-wallet once the functinoality is exposed.
+                // TODO: Do this via forc-wallet once the functionality is exposed.
                 let public_key = PublicKey::from(&secret_key);
                 let hashed = public_key.hash();
                 let bech32 = Bech32Address::new(FUEL_BECH32_HRP, hashed);

sway-core/src/asm_generation/miden_vm/miden_vm_asm_builder.rs

@@ -633,7 +633,7 @@ impl<'ir, 'eng> MidenVMAsmBuilder<'ir, 'eng> {
                 if let Some(rendered) = rendered {
                     rendered
                 } else {
-                    panic!("Not sure what this value is -- is'nt a constant or a configurable. {val:?}")
+                    panic!("Not sure what this value is -- isn't a constant or a configurable. {val:?}")
                 }
             }
         }

sway-core/src/semantic_analysis/ast_node/expression/intrinsic_function.rs

@@ -655,7 +655,7 @@ fn type_check_cmp(
 /// Description: Returns transaction field with ID `tx_field_id` at index `index`, if applicable.
 ///              This is a wrapper around FuelVM's `gtf` instruction:
 ///              https://fuellabs.github.io/fuel-specs/master/vm/instruction_set#gtf-get-transaction-fields.
-///              The resuting field is cast to `T`.
+///              The resulting field is cast to `T`.
 /// Constraints: None.
 fn type_check_gtf(
     handler: &Handler,

sway-core/src/semantic_analysis/ast_node/expression/match_expression/analysis/patstack.rs

@@ -97,7 +97,7 @@ impl PatStack {
         match self.pats.get_mut(n) {
             Some(elem) => Ok(elem),
             None => Err(handler.emit_err(CompileError::Internal(
-                "cant retrieve mutable reference to element",
+                "can't retrieve mutable reference to element",
                 span.clone(),
             ))),
         }

sway-core/src/semantic_analysis/ast_node/expression/match_expression/analysis/pattern.rs

@@ -229,7 +229,7 @@ impl Pattern {
     ///
     /// ---
     ///
-    /// If if is the case that at lease one element of *args* is a
+    /// If it is the case that at lease one element of *args* is a
     /// or-pattern, then *args* is first "serialized". Meaning, that all
     /// or-patterns are extracted to create a vec of `PatStack`s *args*' where
     /// each `PatStack` is a copy of *args* where the index of the or-pattern is

sway-ir/src/verify.rs

@@ -151,7 +151,7 @@ impl<'eng> Context<'eng> {
     }
 
     fn verify_metadata(&self, md_idx: Option<MetadataIndex>) -> Result<(), IrError> {
-        // For now we check only that struct tags are valid identiers.
+        // For now we check only that struct tags are valid identifiers.
         if let Some(md_idx) = md_idx {
             match &self.metadata[md_idx.0] {
                 Metadatum::List(md_idcs) => {