diff --git a/ast/src/common/range_or_expression.rs b/ast/src/common/range_or_expression.rs index a20934a4ae..58f79cabe4 100644 --- a/ast/src/common/range_or_expression.rs +++ b/ast/src/common/range_or_expression.rs @@ -34,8 +34,8 @@ impl<'ast> fmt::Display for RangeOrExpression<'ast> { RangeOrExpression::Range(ref range) => write!( f, "{}..{}", - range.from.as_ref().map(|v| format!("{}", v)).unwrap_or(format!("")), - range.to.as_ref().map(|v| format!("{}", v)).unwrap_or(format!("")), + range.from.as_ref().map(|v| v.to_string()).unwrap_or("".to_string()), + range.to.as_ref().map(|v| v.to_string()).unwrap_or("".to_string()), ), } } diff --git a/ast/src/common/variables.rs b/ast/src/common/variables.rs index 2e8f3ea084..9d63803a93 100644 --- a/ast/src/common/variables.rs +++ b/ast/src/common/variables.rs @@ -38,12 +38,7 @@ impl<'ast> fmt::Display for Variables<'ast> { write!(f, "{}", self.names[0])?; } else { // (a, mut b) - let names = self - .names - .iter() - .map(|x| format!("{}", x)) - .collect::>() - .join(","); + let names = self.names.iter().map(|x| x.to_string()).collect::>().join(","); write!(f, "({})", names)?; } diff --git a/ast/src/errors/parser.rs b/ast/src/errors/parser.rs index ca1b860528..bfeb7c7ada 100644 --- a/ast/src/errors/parser.rs +++ b/ast/src/errors/parser.rs @@ -62,6 +62,6 @@ impl From> for ParserError { impl From for ParserError { fn from(error: std::io::Error) -> Self { - ParserError::Crate("std::io", format!("{}", error)) + ParserError::Crate("std::io", error.to_string()) } } diff --git a/ast/src/statements/definition_statement.rs b/ast/src/statements/definition_statement.rs index 6c78a6ffe3..4376e1c4f2 100644 --- a/ast/src/statements/definition_statement.rs +++ b/ast/src/statements/definition_statement.rs @@ -43,7 +43,7 @@ impl<'ast> fmt::Display for DefinitionStatement<'ast> { let expressions = self .expressions .iter() - .map(|x| format!("{}", x)) + .map(|x| x.to_string()) .collect::>() .join(","); diff --git a/compiler/src/errors/output_file.rs b/compiler/src/errors/output_file.rs index 8bb8b9d662..c47a4e8ead 100644 --- a/compiler/src/errors/output_file.rs +++ b/compiler/src/errors/output_file.rs @@ -36,6 +36,6 @@ pub enum OutputFileError { impl From for OutputFileError { fn from(error: std::io::Error) -> Self { - OutputFileError::Crate("std::io", format!("{}", error)) + OutputFileError::Crate("std::io", error.to_string()) } } diff --git a/compiler/src/expression/function/function.rs b/compiler/src/expression/function/function.rs index 395bccce1a..9a6a322d04 100644 --- a/compiler/src/expression/function/function.rs +++ b/compiler/src/expression/function/function.rs @@ -41,7 +41,7 @@ impl> ConstrainedProgram { // Call a circuit function that can mutate self. // Save a reference to the circuit we are mutating. - let circuit_id_string = format!("{}", circuit_identifier); + let circuit_id_string = circuit_identifier.to_string(); let declared_circuit_reference = new_scope(function_scope.clone(), circuit_id_string); ( diff --git a/compiler/src/value/group/targets/edwards_bls12.rs b/compiler/src/value/group/targets/edwards_bls12.rs index 2e45baf4d1..acd9d4a0cf 100644 --- a/compiler/src/value/group/targets/edwards_bls12.rs +++ b/compiler/src/value/group/targets/edwards_bls12.rs @@ -268,7 +268,7 @@ impl EdwardsGroupType { if element.is_on_curve() { Ok(element) } else { - Err(GroupError::not_on_curve(format!("{}", element), element_span)) + Err(GroupError::not_on_curve(element.to_string(), element_span)) } } diff --git a/compiler/src/value/value.rs b/compiler/src/value/value.rs index 15ac98a508..a61ebb19f1 100644 --- a/compiler/src/value/value.rs +++ b/compiler/src/value/value.rs @@ -348,7 +348,7 @@ impl> fmt::Display for ConstrainedValue { - let values = tuple.iter().map(|x| format!("{}", x)).collect::>().join(", "); + let values = tuple.iter().map(|x| x.to_string()).collect::>().join(", "); write!(f, "({})", values) } diff --git a/compiler/tests/syntax/mod.rs b/compiler/tests/syntax/mod.rs index 2472df4f87..d1ba353324 100644 --- a/compiler/tests/syntax/mod.rs +++ b/compiler/tests/syntax/mod.rs @@ -45,7 +45,7 @@ fn test_undefined() { ExpressionError::Error(error), ))) => { assert_eq!( - format!("{}", error), + error.to_string(), vec![ " --> \"/test/src/main.leo\": 2:12", " |", diff --git a/core/src/types/value.rs b/core/src/types/value.rs index e08d584769..0113e14cc2 100644 --- a/core/src/types/value.rs +++ b/core/src/types/value.rs @@ -56,14 +56,14 @@ impl fmt::Display for Value { Value::I64(value) => value.value.map(|v| v.to_string()), Value::I128(value) => value.value.map(|v| v.to_string()), Value::Array(values) => { - let string = values.iter().map(|v| format!("{}", v)).collect::>().join(", "); + let string = values.iter().map(|v| v.to_string()).collect::>().join(", "); write!(f, "[{}]", string)?; Some("".to_owned()) } Value::Tuple(values) => { - let string = values.iter().map(|v| format!("{}", v)).collect::>().join(", "); + let string = values.iter().map(|v| v.to_string()).collect::>().join(", "); write!(f, "[{}]", string)?; diff --git a/input/src/expressions/expression.rs b/input/src/expressions/expression.rs index c58bc66490..fc8ce43f44 100644 --- a/input/src/expressions/expression.rs +++ b/input/src/expressions/expression.rs @@ -50,7 +50,7 @@ impl<'ast> fmt::Display for Expression<'ast> { let values = array .expressions .iter() - .map(|x| format!("{}", x)) + .map(|x| x.to_string()) .collect::>() .join(", "); @@ -60,7 +60,7 @@ impl<'ast> fmt::Display for Expression<'ast> { let values = tuple .expressions .iter() - .map(|x| format!("{}", x)) + .map(|x| x.to_string()) .collect::>() .join(", "); diff --git a/input/src/types/tuple_type.rs b/input/src/types/tuple_type.rs index feca7e830a..ebe9c9d068 100644 --- a/input/src/types/tuple_type.rs +++ b/input/src/types/tuple_type.rs @@ -29,12 +29,7 @@ pub struct TupleType<'ast> { impl<'ast> std::fmt::Display for TupleType<'ast> { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { - let tuple = self - .types_ - .iter() - .map(|x| format!("{}", x)) - .collect::>() - .join(", "); + let tuple = self.types_.iter().map(|x| x.to_string()).collect::>().join(", "); write!(f, "({})", tuple) } diff --git a/leo/errors/cli.rs b/leo/errors/cli.rs index 59cd13599f..3dbb264514 100644 --- a/leo/errors/cli.rs +++ b/leo/errors/cli.rs @@ -159,7 +159,7 @@ impl_cli_error!( impl From for CLIError { fn from(error: clap::Error) -> Self { tracing::error!("{}\n", error); - CLIError::Crate("clap", format!("{}", error)) + CLIError::Crate("clap", error.to_string()) } } @@ -180,34 +180,34 @@ impl From for CLIError { impl From for CLIError { fn from(error: reqwest::Error) -> Self { tracing::error!("{}\n", error); - CLIError::Crate("rewquest", format!("{}", error)) + CLIError::Crate("rewquest", error.to_string()) } } impl From for CLIError { fn from(error: snarkos_errors::algorithms::snark::SNARKError) -> Self { tracing::error!("{}\n", error); - CLIError::Crate("snarkos_errors", format!("{}", error)) + CLIError::Crate("snarkos_errors", error.to_string()) } } impl From for CLIError { fn from(error: snarkos_errors::gadgets::SynthesisError) -> Self { tracing::error!("{}\n", error); - CLIError::Crate("snarkos_errors", format!("{}", error)) + CLIError::Crate("snarkos_errors", error.to_string()) } } impl From for CLIError { fn from(error: serde_json::error::Error) -> Self { tracing::error!("{}\n", error); - CLIError::Crate("serde_json", format!("{}", error)) + CLIError::Crate("serde_json", error.to_string()) } } impl From for CLIError { fn from(error: std::io::Error) -> Self { tracing::error!("{}\n", error); - CLIError::Crate("std::io", format!("{}", error)) + CLIError::Crate("std::io", error.to_string()) } } diff --git a/leo/updater.rs b/leo/updater.rs index 3b92b990bf..ec730963fa 100644 --- a/leo/updater.rs +++ b/leo/updater.rs @@ -75,9 +75,9 @@ impl Updater { } else { // If the auto update configuration is off, notify the user to update leo. if let Some(latest_version) = Self::update_available().unwrap() { - let mut message = format!("{}", "🟢 A new version is available! Run".bold().green()); - message += &format!("{}", " `leo update` ".bold().white()); - message += &format!("{}", &(format!("to update to v{}.", latest_version)).bold().green()); + let mut message = "🟢 A new version is available! Run".bold().green().to_string(); + message += &" `leo update` ".bold().white(); + message += &format!("to update to v{}.", latest_version).bold().green(); tracing::info!("\n{}\n", message); } diff --git a/package/src/errors/inputs/input.rs b/package/src/errors/inputs/input.rs index 93ff2e44d1..8c08355a0e 100644 --- a/package/src/errors/inputs/input.rs +++ b/package/src/errors/inputs/input.rs @@ -33,6 +33,6 @@ pub enum InputFileError { impl From for InputFileError { fn from(error: std::io::Error) -> Self { - InputFileError::Crate("std::io", format!("{}", error)) + InputFileError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/inputs/state.rs b/package/src/errors/inputs/state.rs index ea372555a9..869b0f7b0b 100644 --- a/package/src/errors/inputs/state.rs +++ b/package/src/errors/inputs/state.rs @@ -33,6 +33,6 @@ pub enum StateFileError { impl From for StateFileError { fn from(error: std::io::Error) -> Self { - StateFileError::Crate("std::io", format!("{}", error)) + StateFileError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/outputs/checksum.rs b/package/src/errors/outputs/checksum.rs index d3bd8c5dfc..780c0b9617 100644 --- a/package/src/errors/outputs/checksum.rs +++ b/package/src/errors/outputs/checksum.rs @@ -36,6 +36,6 @@ pub enum ChecksumFileError { impl From for ChecksumFileError { fn from(error: std::io::Error) -> Self { - ChecksumFileError::Crate("std::io", format!("{}", error)) + ChecksumFileError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/outputs/circuit.rs b/package/src/errors/outputs/circuit.rs index 19fd1553e3..631d3b8f72 100644 --- a/package/src/errors/outputs/circuit.rs +++ b/package/src/errors/outputs/circuit.rs @@ -36,6 +36,6 @@ pub enum CircuitFileError { impl From for CircuitFileError { fn from(error: std::io::Error) -> Self { - CircuitFileError::Crate("std::io", format!("{}", error)) + CircuitFileError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/outputs/proof.rs b/package/src/errors/outputs/proof.rs index 7dad60fdcc..31db518ea0 100644 --- a/package/src/errors/outputs/proof.rs +++ b/package/src/errors/outputs/proof.rs @@ -36,6 +36,6 @@ pub enum ProofFileError { impl From for ProofFileError { fn from(error: std::io::Error) -> Self { - ProofFileError::Crate("std::io", format!("{}", error)) + ProofFileError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/outputs/proving_key.rs b/package/src/errors/outputs/proving_key.rs index d8643bc683..fe73a56cdf 100644 --- a/package/src/errors/outputs/proving_key.rs +++ b/package/src/errors/outputs/proving_key.rs @@ -36,6 +36,6 @@ pub enum ProvingKeyFileError { impl From for ProvingKeyFileError { fn from(error: std::io::Error) -> Self { - ProvingKeyFileError::Crate("std::io", format!("{}", error)) + ProvingKeyFileError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/outputs/verification_key.rs b/package/src/errors/outputs/verification_key.rs index 7a824496c7..8c4ac9dbb4 100644 --- a/package/src/errors/outputs/verification_key.rs +++ b/package/src/errors/outputs/verification_key.rs @@ -39,6 +39,6 @@ pub enum VerificationKeyFileError { impl From for VerificationKeyFileError { fn from(error: std::io::Error) -> Self { - VerificationKeyFileError::Crate("std::io", format!("{}", error)) + VerificationKeyFileError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/package.rs b/package/src/errors/package.rs index b1a86d6419..c2d89f0219 100644 --- a/package/src/errors/package.rs +++ b/package/src/errors/package.rs @@ -17,72 +17,72 @@ pub enum PackageError { impl From for PackageError { fn from(error: std::io::Error) -> Self { - PackageError::Crate("std::io", format!("{}", error)) + PackageError::Crate("std::io", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::GitignoreError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::InputFileError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::InputsDirectoryError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::ImportsDirectoryError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::OutputsDirectoryError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::READMEError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::SourceDirectoryError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::StateFileError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::LibraryFileError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::ManifestError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } impl From for PackageError { fn from(error: crate::errors::MainFileError) -> Self { - PackageError::Crate("leo-package", format!("{}", error)) + PackageError::Crate("leo-package", error.to_string()) } } diff --git a/package/src/errors/root/gitignore.rs b/package/src/errors/root/gitignore.rs index 449ce0f7ce..83fbf7ce44 100644 --- a/package/src/errors/root/gitignore.rs +++ b/package/src/errors/root/gitignore.rs @@ -30,6 +30,6 @@ pub enum GitignoreError { impl From for GitignoreError { fn from(error: std::io::Error) -> Self { - GitignoreError::Crate("std::io", format!("{}", error)) + GitignoreError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/root/readme.rs b/package/src/errors/root/readme.rs index c2fc7c4e37..919d767aa5 100644 --- a/package/src/errors/root/readme.rs +++ b/package/src/errors/root/readme.rs @@ -30,6 +30,6 @@ pub enum READMEError { impl From for READMEError { fn from(error: std::io::Error) -> Self { - READMEError::Crate("std::io", format!("{}", error)) + READMEError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/root/zip.rs b/package/src/errors/root/zip.rs index c3c8c5c7c2..0f9391c3fe 100644 --- a/package/src/errors/root/zip.rs +++ b/package/src/errors/root/zip.rs @@ -44,6 +44,6 @@ pub enum ZipFileError { impl From for ZipFileError { fn from(error: std::io::Error) -> Self { - ZipFileError::Crate("std::io", format!("{}", error)) + ZipFileError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/source/lib.rs b/package/src/errors/source/lib.rs index ee76aa2646..75d643a14c 100644 --- a/package/src/errors/source/lib.rs +++ b/package/src/errors/source/lib.rs @@ -30,6 +30,6 @@ pub enum LibraryFileError { impl From for LibraryFileError { fn from(error: std::io::Error) -> Self { - LibraryFileError::Crate("std::io", format!("{}", error)) + LibraryFileError::Crate("std::io", error.to_string()) } } diff --git a/package/src/errors/source/main.rs b/package/src/errors/source/main.rs index 816a2b01a8..5bda24693f 100644 --- a/package/src/errors/source/main.rs +++ b/package/src/errors/source/main.rs @@ -30,6 +30,6 @@ pub enum MainFileError { impl From for MainFileError { fn from(error: std::io::Error) -> Self { - MainFileError::Crate("std::io", format!("{}", error)) + MainFileError::Crate("std::io", error.to_string()) } } diff --git a/state/src/record_commitment/dpc_record_values.rs b/state/src/record_commitment/dpc_record_values.rs index a29e69414a..4137267d40 100644 --- a/state/src/record_commitment/dpc_record_values.rs +++ b/state/src/record_commitment/dpc_record_values.rs @@ -58,7 +58,7 @@ impl TryFrom<&TypedRecord> for DPCRecordValues { // Lookup record owner let owner_value = find_input(OWNER_PARAMETER_STRING.to_owned(), ¶meters)?; - let owner = AccountAddress::::from_str(&format!("{}", owner_value))?; + let owner = AccountAddress::::from_str(&owner_value.to_string())?; // Lookup record is_dummy let is_dummy_value = find_input(IS_DUMMY_PARAMETER_STRING.to_owned(), ¶meters)?; diff --git a/typed/src/common/variables.rs b/typed/src/common/variables.rs index b096545296..f3c7efa68a 100644 --- a/typed/src/common/variables.rs +++ b/typed/src/common/variables.rs @@ -44,12 +44,7 @@ impl fmt::Display for Variables { write!(f, "{}", self.names[0])?; } else { // (a, mut b) - let names = self - .names - .iter() - .map(|x| format!("{}", x)) - .collect::>() - .join(","); + let names = self.names.iter().map(|x| x.to_string()).collect::>().join(","); write!(f, "({})", names)?; } diff --git a/typed/src/errors/error.rs b/typed/src/errors/error.rs index 67552ee2d6..ba787ef9c1 100644 --- a/typed/src/errors/error.rs +++ b/typed/src/errors/error.rs @@ -136,7 +136,7 @@ fn test_error() { }; assert_eq!( - format!("{}", err), + err.to_string(), vec![ " --> file.leo: 2:8", " |", diff --git a/typed/src/expression.rs b/typed/src/expression.rs index bf2d6deeb1..d7d5f03034 100644 --- a/typed/src/expression.rs +++ b/typed/src/expression.rs @@ -242,7 +242,7 @@ impl<'ast> fmt::Display for Expression { // Tuples Expression::Tuple(ref tuple, ref _span) => { - let values = tuple.iter().map(|x| format!("{}", x)).collect::>().join(", "); + let values = tuple.iter().map(|x| x.to_string()).collect::>().join(", "); write!(f, "({})", values) } diff --git a/typed/src/functions/function.rs b/typed/src/functions/function.rs index b68526cbe6..4a02a03d4f 100644 --- a/typed/src/functions/function.rs +++ b/typed/src/functions/function.rs @@ -53,13 +53,8 @@ impl Function { fn format(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "function {}", self.identifier)?; - let parameters = self - .input - .iter() - .map(|x| format!("{}", x)) - .collect::>() - .join(","); - let returns = self.returns.as_ref().map(|type_| format!("{}", type_)); + let parameters = self.input.iter().map(|x| x.to_string()).collect::>().join(","); + let returns = self.returns.as_ref().map(|type_| type_.to_string()); let statements = self .statements .iter() diff --git a/typed/src/input/input_value.rs b/typed/src/input/input_value.rs index 03ab13e7f9..befc9c50d6 100644 --- a/typed/src/input/input_value.rs +++ b/typed/src/input/input_value.rs @@ -260,12 +260,12 @@ impl fmt::Display for InputValue { InputValue::Field(ref field) => write!(f, "{}", field), InputValue::Integer(ref type_, ref number) => write!(f, "{}{:?}", number, type_), InputValue::Array(ref array) => { - let values = array.iter().map(|x| format!("{}", x)).collect::>().join(", "); + let values = array.iter().map(|x| x.to_string()).collect::>().join(", "); write!(f, "array [{}]", values) } InputValue::Tuple(ref tuple) => { - let values = tuple.iter().map(|x| format!("{}", x)).collect::>().join(", "); + let values = tuple.iter().map(|x| x.to_string()).collect::>().join(", "); write!(f, "({})", values) } diff --git a/typed/src/statements/statement.rs b/typed/src/statements/statement.rs index c7ce04476e..481d4c77a4 100644 --- a/typed/src/statements/statement.rs +++ b/typed/src/statements/statement.rs @@ -189,11 +189,7 @@ impl fmt::Display for Statement { match *self { Statement::Return(ref expression, ref _span) => write!(f, "return {}", expression), Statement::Definition(ref declare, ref variable, ref expressions, ref _span) => { - let formatted_expressions = expressions - .iter() - .map(|x| format!("{}", x)) - .collect::>() - .join(","); + let formatted_expressions = expressions.iter().map(|x| x.to_string()).collect::>().join(","); write!(f, "{} {} = {};", declare, variable, formatted_expressions) } diff --git a/typed/src/types/type_.rs b/typed/src/types/type_.rs index 2dab59356d..9c0e5b2a87 100644 --- a/typed/src/types/type_.rs +++ b/typed/src/types/type_.rs @@ -217,15 +217,11 @@ impl fmt::Display for Type { Type::Circuit(ref variable) => write!(f, "circuit {}", variable), Type::SelfType => write!(f, "SelfType"), Type::Array(ref array, ref dimensions) => { - let dimensions = dimensions - .iter() - .map(|x| format!("{}", x)) - .collect::>() - .join(", "); + let dimensions = dimensions.iter().map(|x| x.to_string()).collect::>().join(", "); write!(f, "[{}; ({})]", *array, dimensions) } Type::Tuple(ref tuple) => { - let types = tuple.iter().map(|x| format!("{}", x)).collect::>().join(", "); + let types = tuple.iter().map(|x| x.to_string()).collect::>().join(", "); write!(f, "({})", types) }