Use variable interpolation for println!.

This commit is contained in:
Stephen Chung
2022-10-27 13:38:21 +08:00
parent 6b24cc151e
commit 3c2e031883
24 changed files with 132 additions and 150 deletions

View File

@@ -38,7 +38,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
engine
.gen_fn_signatures(false)
.into_iter()
.for_each(|func| println!("{}", func));
.for_each(|func| println!("{func}"));
println!();
}
@@ -51,7 +51,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
",
)?;
println!("{:?}", result);
println!("{result:?}");
let result = engine.eval::<TestStruct>(
"
@@ -61,7 +61,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
",
)?;
println!("{:?}", result);
println!("{result:?}");
Ok(())
}

View File

@@ -36,7 +36,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
let r2 = func(1, 2);
let r3 = func(1, 2);
println!("The Answers: {}, {}, {}", r1, r2, r3); // prints 40, 42, 44
println!("The Answers: {r1}, {r2}, {r3}"); // prints 40, 42, 44
Ok(())
}

View File

@@ -67,7 +67,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
engine
.gen_fn_signatures(false)
.into_iter()
.for_each(|func| println!("{}", func));
.for_each(|func| println!("{func}"));
println!();
}
@@ -89,7 +89,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
",
)?;
println!("result: {}", result); // prints 1085764
println!("result: {result}"); // prints 1085764
Ok(())
}

View File

@@ -48,7 +48,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
engine
.gen_fn_signatures(false)
.into_iter()
.for_each(|func| println!("{}", func));
.for_each(|func| println!("{func}"));
println!();
}
@@ -62,7 +62,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
",
)?;
println!("result: {}", result); // prints 1085764
println!("result: {result}"); // prints 1085764
Ok(())
}

View File

@@ -78,12 +78,12 @@ pub fn main() {
scope.push_constant("MY_CONSTANT", 42_i64);
// Compile the handler script.
println!("> Loading script file: {}", path);
println!("> Loading script file: {path}");
let ast = match engine.compile_file_with_scope(&mut scope, path.into()) {
Ok(ast) => ast,
Err(err) => {
eprintln!("! Error: {}", err);
eprintln!("! Error: {err}");
println!("Cannot continue. Bye!");
return;
}
@@ -101,7 +101,7 @@ pub fn main() {
let result = engine.call_fn_raw(&mut scope, &ast, false, true, "init", Some(&mut states), []);
if let Err(err) = result {
eprintln!("! {}", err)
eprintln!("! {err}")
}
// Create handler instance
@@ -152,7 +152,7 @@ pub fn main() {
engine.call_fn_raw(scope, ast, false, true, event, this_ptr, [arg.into()]);
if let Err(err) = result {
eprintln!("! {}", err)
eprintln!("! {err}")
}
}
}

View File

@@ -67,7 +67,7 @@ pub fn main() {
scope.push_constant("MY_CONSTANT", 42_i64);
// Compile the handler script.
println!("> Loading script file: {}", path);
println!("> Loading script file: {path}");
let ast = match engine.compile_file_with_scope(&mut scope, path.into()) {
Ok(ast) => ast,
@@ -89,7 +89,7 @@ pub fn main() {
let result = engine.call_fn_raw(&mut scope, &ast, false, false, "init", None, []);
if let Err(err) = result {
eprintln!("! {}", err)
eprintln!("! {err}")
}
// Create handler instance
@@ -127,7 +127,7 @@ pub fn main() {
let result = engine.call_fn::<()>(scope, ast, event, (arg.to_string(),));
if let Err(err) = result {
eprintln!("! {}", err)
eprintln!("! {err}")
}
}
}

View File

@@ -81,12 +81,12 @@ pub fn main() {
scope.push("state", states);
// Compile the handler script.
println!("> Loading script file: {}", path);
println!("> Loading script file: {path}");
let ast = match engine.compile_file_with_scope(&mut scope, path.into()) {
Ok(ast) => ast,
Err(err) => {
eprintln!("! Error: {}", err);
eprintln!("! Error: {err}");
println!("Cannot continue. Bye!");
return;
}
@@ -103,7 +103,7 @@ pub fn main() {
let result = engine.call_fn::<()>(&mut scope, &ast, "init", ());
if let Err(err) = result {
eprintln!("! {}", err)
eprintln!("! {err}")
}
// Create handler instance
@@ -141,7 +141,7 @@ pub fn main() {
let result = engine.call_fn::<()>(scope, ast, event, (arg.to_string(),));
if let Err(err) = result {
eprintln!("! {}", err)
eprintln!("! {err}")
}
}
}

View File

@@ -9,7 +9,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
let result = engine.eval::<i64>("40 + 2")?;
println!("The Answer: {}", result); // prints 42
println!("The Answer: {result}"); // prints 42
Ok(())
}

View File

@@ -13,7 +13,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
for _ in 0..10 {
let result = engine.eval_with_scope::<i64>(&mut scope, "x += 1; x")?;
println!("result: {}", result);
println!("result: {result}");
}
println!("x = {}", scope.get_value::<i64>("x").unwrap());

View File

@@ -36,13 +36,13 @@ fn main() {
},
};
println!("Source struct: {:#?}", x);
println!("Source struct: {x:#?}");
// Convert the 'MyStruct' into a 'Dynamic'
let map: Dynamic = to_dynamic(x).unwrap();
assert!(map.is::<Map>());
println!("Serialized to Dynamic: {:#?}", map);
println!("Serialized to Dynamic: {map:#?}");
}
pub fn de() {
@@ -60,7 +60,7 @@ fn main() {
)
.unwrap();
println!("Source Dynamic: {:#?}", result);
println!("Source Dynamic: {result:#?}");
// Convert the 'Dynamic' object map into 'MyStruct'
let x: MyStruct = from_dynamic(&result).unwrap();
@@ -77,7 +77,7 @@ fn main() {
},
}
);
println!("Deserialized to struct: {:#?}", x);
println!("Deserialized to struct: {x:#?}");
}
ser();

View File

@@ -13,7 +13,7 @@ fn main() -> Result<(), Box<EvalAltResult>> {
let result = engine.eval::<i64>("add(40, 2)")?;
println!("Answer: {}", result); // prints 42
println!("Answer: {result}"); // prints 42
Ok(())
}

View File

@@ -37,10 +37,10 @@ fn main() -> Result<(), Box<EvalAltResult>> {
.register_fn("index_of", find_substring)
// Register string functions using closures
.register_fn("display", |label: &str, value: i64| {
println!("{}: {}", label, value)
println!("{label}: {value}")
})
.register_fn("display", |label: ImmutableString, value: &str| {
println!(r#"{}: "{}""#, label, value) // Quote the input string
println!(r#"{label}: "{value}""#) // Quote the input string
});
let mut scope = Scope::new();

View File

@@ -60,7 +60,7 @@ fn main() {
let mut value: i64 = 0;
while value < 10 {
println!("Value: {}", value);
println!("Value: {value}");
// Send value to script
tx_master.send(value).unwrap();
// Receive value from script