Merge branch 'master' of github.com:FuelLabs/sway into vaivaswatha/arg_mut_analysis

Author: vaivaswatha

forc-plugins/forc-client/src/cmd/call.rs

@@ -419,6 +419,10 @@ pub struct Command {
     #[clap(long, short = 'o', default_value = "default", help_heading = "OUTPUT")]
     pub output: OutputFormat,
 
+    /// Contract call variable output count
+    #[clap(long, alias = "variable-output", help_heading = "VARIABLE OUTPUT")]
+    pub variable_output: Option<usize>,
+
     /// Set verbosity levels; currently only supports max 2 levels
     /// - `-v=1`: Print decoded logs
     /// - `-v=2`: Additionally print receipts and script json

forc-plugins/forc-client/src/op/call/call_function.rs

@@ -50,6 +50,7 @@ pub async fn call_function(
         mut output,
         external_contracts,
         contract_abis,
+        variable_output,
         ..
     } = cmd;
 
@@ -88,7 +89,9 @@ pub async fn call_function(
     };
 
     // Setup variable output policy and log decoder
-    let variable_output_policy = VariableOutputPolicy::Exactly(call_parameters.amount as usize);
+    let variable_output_policy = variable_output
+        .map(VariableOutputPolicy::Exactly)
+        .unwrap_or(VariableOutputPolicy::EstimateMinimum);
     let error_codes = abi
         .unified
         .error_codes
@@ -275,8 +278,6 @@ pub async fn call_function(
     let fuel_tx::Transaction::Script(script) = &tx else {
         bail!("Transaction is not a script");
     };
-    let script_json = serde_json::to_value(script)
-        .map_err(|e| anyhow!("Failed to convert script to JSON: {e}"))?;
 
     // Parse the result based on output format
     let mut receipt_parser =
@@ -330,7 +331,7 @@ pub async fn call_function(
 
         super::display_detailed_call_info(
             &tx_execution,
-            &script_json,
+            script,
             &abi_map,
             cmd.verbosity,
             &mut output,
@@ -357,7 +358,7 @@ pub async fn call_function(
         result: Some(result),
         total_gas: *tx_execution.result.total_gas(),
         receipts: tx_execution.result.receipts().to_vec(),
-        script_json: Some(script_json),
+        script: Some(script.to_owned()),
         trace_events,
     })
 }
@@ -466,6 +467,7 @@ pub mod tests {
         cmd,
         op::call::{call, get_wallet, PrivateKeySigner},
     };
+    use fuel_tx::field::Outputs;
     use fuels::{crypto::SecretKey, prelude::*};
     use std::path::PathBuf;
 
@@ -493,6 +495,7 @@ pub mod tests {
             label: None,
             output: cmd::call::OutputFormat::Raw,
             list_functions: false,
+            variable_output: None,
             verbosity: 0,
             debug: false,
         }
@@ -948,15 +951,9 @@ pub mod tests {
             gas_forwarded: None,
         };
         // validate balance is unchanged (dry-run)
-        assert_eq!(
-            call(operation.clone(), cmd.clone())
-                .await
-                .unwrap()
-                .result
-                .unwrap(),
-            "()"
-        );
-        assert_eq!(get_contract_balance(id_2, provider.clone()).await, 0);
+        let call_response = call(operation.clone(), cmd.clone()).await.unwrap();
+        assert_eq!(call_response.result.unwrap(), "()");
+        assert_eq!(call_response.script.unwrap().outputs().len(), 2);
         cmd.mode = cmd::call::ExecutionMode::Live;
         assert_eq!(call(operation, cmd).await.unwrap().result.unwrap(), "()");
         assert_eq!(get_contract_balance(id_2, provider.clone()).await, 1);
@@ -983,7 +980,9 @@ pub mod tests {
         };
         cmd.mode = cmd::call::ExecutionMode::Live;
         let operation = cmd.validate_and_get_operation().unwrap();
-        assert_eq!(call(operation, cmd).await.unwrap().result.unwrap(), "()");
+        let call_response = call(operation, cmd).await.unwrap();
+        assert_eq!(call_response.result.unwrap(), "()");
+        assert_eq!(call_response.script.unwrap().outputs().len(), 3);
         assert_eq!(
             get_recipient_balance(random_wallet.address(), provider.clone()).await,
             2
@@ -1041,7 +1040,9 @@ pub mod tests {
         };
         cmd.mode = cmd::call::ExecutionMode::Live;
         let operation = cmd.validate_and_get_operation().unwrap();
-        assert_eq!(call(operation, cmd).await.unwrap().result.unwrap(), "()");
+        let call_response = call(operation, cmd).await.unwrap();
+        assert_eq!(call_response.result.unwrap(), "()");
+        assert_eq!(call_response.script.unwrap().outputs().len(), 3);
         assert_eq!(
             get_recipient_balance(random_wallet.address(), provider.clone()).await,
             3

forc-plugins/forc-client/src/op/call/mod.rs

@@ -45,7 +45,7 @@ pub struct CallResponse {
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub trace_events: Vec<trace::TraceEvent>,
     #[serde(rename = "Script", skip_serializing_if = "Option::is_none")]
-    pub script_json: Option<serde_json::Value>,
+    pub script: Option<fuel_tx::Script>,
 }
 
 /// A command for calling a contract function.
@@ -266,7 +266,7 @@ pub(crate) fn display_tx_info(
 /// Prints receipts and trace to the writer based on verbosity level
 pub(crate) fn display_detailed_call_info(
     tx: &TransactionExecutionStatus,
-    script_json: &serde_json::Value,
+    script: &fuel_tx::Script,
     abis: &HashMap<ContractId, Abi>,
     verbosity: u8,
     writer: &mut impl std::io::Write,
@@ -276,7 +276,7 @@ pub(crate) fn display_detailed_call_info(
     if verbosity >= 4 {
         forc_tracing::println_label_green(
             "transaction script:\n",
-            &serde_json::to_string_pretty(script_json).unwrap(),
+            &serde_json::to_string_pretty(script).unwrap(),
         );
     }
     if verbosity >= 3 {

forc-plugins/forc-client/src/op/call/transfer.rs

@@ -48,7 +48,7 @@ pub async fn transfer(
         total_gas: tx_response.tx_status.total_gas,
         result: None,
         receipts: tx_response.tx_status.receipts,
-        script_json: None,
+        script: None,
         trace_events: vec![],
     })
 }

forc-plugins/forc-mcp/src/forc_call/mod.rs

@@ -540,6 +540,7 @@ fn build_call_command(
         gas,
         external_contracts: None,
         output: OutputFormat::Json,
+        variable_output: None,
         verbosity,
         debug: false,
     })
@@ -582,6 +583,7 @@ fn build_list_command(contract_id: &str, abi: &str) -> anyhow::Result<forc_clien
         gas: None,
         external_contracts: None,
         output: OutputFormat::Default,
+        variable_output: None,
         verbosity: 0,
         debug: false,
     })
@@ -641,6 +643,7 @@ fn build_transfer_command(
         gas: None,
         external_contracts: None,
         output: OutputFormat::Json,
+        variable_output: None,
         verbosity,
         debug: false,
     })

forc-plugins/forc-node/src/util.rs

@@ -257,7 +257,7 @@ mod tests {
     fn test_human_readable_config() {
         let config = Config::local_node();
         let human_readable = HumanReadableConfig(&config);
-        let formatted = format!("{}", human_readable);
+        let formatted = format!("{human_readable}");
         let expected = format!(
             r#"Fuel Core Configuration:
   GraphQL Address: {}

sway-core/src/language/ty/declaration/const_generic.rs

@@ -54,9 +54,7 @@ impl MaterializeConstGenerics for TyConstGenericDecl {
                                 .unwrap()
                                 .cast_value_to_u64()
                                 .unwrap(),
-                        "{:?} {:?}",
-                        v,
-                        value
+                        "{v:?} {value:?}",
                     );
                 }
                 None => {

sway-core/src/semantic_analysis/namespace/trait_map.rs

@@ -236,24 +236,24 @@ impl DebugWithEngines for TypeRootFilter {
             U64 => write!(f, "u64"),
             U256 => write!(f, "u256"),
             Bool => write!(f, "bool"),
-            Custom(name) => write!(f, "Custom({})", name),
+            Custom(name) => write!(f, "Custom({name})"),
             B256 => write!(f, "b256"),
             Contract => write!(f, "Contract"),
             ErrorRecovery => write!(f, "ErrorRecovery"),
-            Tuple(n) => write!(f, "Tuple(len={})", n),
+            Tuple(n) => write!(f, "Tuple(len={n})"),
             Enum(parsed_id) => {
-                write!(f, "Enum({:?})", parsed_id)
+                write!(f, "Enum({parsed_id:?})")
             }
             Struct(parsed_id) => {
-                write!(f, "Struct({:?})", parsed_id)
+                write!(f, "Struct({parsed_id:?})")
             }
-            ContractCaller(abi_name) => write!(f, "ContractCaller({})", abi_name),
+            ContractCaller(abi_name) => write!(f, "ContractCaller({abi_name})"),
             Array => write!(f, "Array"),
             RawUntypedPtr => write!(f, "RawUntypedPtr"),
             RawUntypedSlice => write!(f, "RawUntypedSlice"),
             Ptr => write!(f, "Ptr"),
             Slice => write!(f, "Slice"),
-            TraitType(name) => write!(f, "TraitType({})", name),
+            TraitType(name) => write!(f, "TraitType({name})"),
         }
     }
 }
@@ -324,14 +324,13 @@ impl DebugWithEngines for TraitMap {
 
                 writeln!(
                     f,
-                    "    impl {} for {} [{}]{} {{",
-                    trait_name_str, ty_str, iface_flag, impl_tparams
+                    "    impl {trait_name_str} for {ty_str} [{iface_flag}]{impl_tparams} {{"
                 )?;
 
                 for (name, item) in &value.trait_items {
                     match item {
                         ResolvedTraitImplItem::Parsed(_p) => {
-                            writeln!(f, "      - {}: <parsed>", name)?;
+                            writeln!(f, "      - {name}: <parsed>")?;
                         }
                         ResolvedTraitImplItem::Typed(ty_item) => {
                             writeln!(f, "      - {}: {:?}", name, engines.help_out(ty_item))?;

sway-error/src/warning.rs

@@ -1,7 +1,8 @@
 use crate::{
     diagnostic::{Code, Diagnostic, Hint, Issue, Reason, ToDiagnostic},
     formatting::{
-        did_you_mean_help, num_to_str, sequence_to_list, sequence_to_str, Enclosing, Indent,
+        did_you_mean_help, first_line, num_to_str, sequence_to_list, sequence_to_str, Enclosing,
+        Indent,
     },
 };
 
@@ -245,7 +246,7 @@ impl fmt::Display for Warning {
             },
             UnusedReturnValue { r#type } => write!(
                 f,
-                "This returns a value of type {type}, which is not assigned to anything and is \
+                "This returns a value of type \"{type}\", which is not assigned to anything and is \
                  ignored."
             ),
             SimilarMethodFound { lib, module, name } => write!(
@@ -593,6 +594,25 @@ impl ToDiagnostic for CompileWarning {
                 },
                 help: vec![],
             },
+            UnusedReturnValue { r#type } => Diagnostic {
+                reason: Some(Reason::new(code(1), "Returned value is ignored".to_string())),
+                issue: Issue::warning(
+                    source_engine,
+                    self.span(),
+                    "This returns a value which is not assigned to anything and is ignored.".to_string(),
+                ),
+                hints: vec![
+                    Hint::help(
+                        source_engine,
+                        self.span(),
+                        format!("The returned value has type \"{type}\"."),
+                    )
+                ],
+                help: vec![
+                    "If you want to intentionally ignore the returned value, use `let _ = ...`:".to_string(),
+                    format!("{}let _ = {};", Indent::Single, first_line(self.span.as_str(), true)),
+                ],
+            },
            _ => Diagnostic {
                     // TODO: Temporarily we use self here to achieve backward compatibility.
                     //       In general, self must not be used and will not be used once we

sway-lib-std/src/clone.sw

@@ -78,8 +78,7 @@ fn ok_string_array_clone() {
     let a = __to_str_array("abc");
     let b = a.clone();
 
-    let _ = __dbg(a); // TODO __dbg((a, b)) is not working
-    let _ = __dbg(b);
+    let _ = __dbg((a, b));
 
     assert(a == __to_str_array("abc"));
     assert(b == __to_str_array("abc"));