[assembler] Fix some new clippy warnings (following rustup update).

Author: youngman-g

assembler/src/asmlib/parser/helpers.rs

@@ -76,15 +76,13 @@ pub(super) fn punch_address(a: Option<LiteralValue>) -> Result<PunchCommand, Str
             let value = literal.value();
             match Unsigned18Bit::try_from(value) {
                 Err(e) => Err(format!(
-                    "PUNCH address value {:o} is not a valid address: {}",
-                    value, e
+                    "PUNCH address value {value:o} is not a valid address: {e}",
                 )),
                 Ok(halfword) => {
                     let addr: Address = Address::from(halfword);
                     if addr.mark_bit() != Unsigned18Bit::ZERO {
                         Err(format!(
-                            "PUNCH address value {:o} must not be a deferred address",
-                            addr
+                            "PUNCH address value {addr:o} must not be a deferred address",
                         ))
                     } else {
                         Ok(PunchCommand(Some(addr)))

assembler/src/asmlib/readerleader.rs

@@ -10,11 +10,11 @@ fn bit_index(q: u8, bitnum: u8) -> Unsigned6Bit {
         1..=3 => q,
         4 => 0,
         _ => {
-            panic!("invalid quarter number {}", q);
+            panic!("invalid quarter number {q}");
         }
     };
     if bitnum > 12 {
-        panic!("invalid bit number {}", bitnum);
+        panic!("invalid bit number {bitnum}");
     }
     Unsigned6Bit::try_from((quarter << 4) | bitnum).unwrap()
 }

assembler/src/asmlib/symbol.rs

@@ -116,8 +116,7 @@ impl Display for InconsistentSymbolUse {
                 _origin_2,
                 block_identifier_2,
             ) => {
-                write!(f, "symbol {} cannot simultaneously be the origin for {} and {}; names must be unique",
-                               name, block_identifier_1, block_identifier_2)
+                write!(f, "symbol {name} cannot simultaneously be the origin for {block_identifier_1} and {block_identifier_2}; names must be unique")
             }
             InconsistentSymbolUse::MixingOrigin(name, _origin, _incompatibility) => {
                 write!(f, "symbols (in this case {name}) cannot be used as an origin name and a configuration or index value")

assembler/src/asmlib/types.rs

@@ -152,7 +152,7 @@ impl Display for ProgramError {
                 Ok(())
             }
             SyntaxError { span: _, msg } => {
-                write!(f, "{}", msg)
+                write!(f, "{msg}")
             }
         }
     }

assembler/src/tx2dis/main.rs

@@ -99,7 +99,7 @@ fn disassemble_block(mut pos: Unsigned18Bit, block: &[Unsigned36Bit]) {
 
 fn disassemble_word(loc: Unsigned18Bit, w: Unsigned36Bit, is_origin: bool) {
     if is_origin {
-        print!("{:>06o}|", loc);
+        print!("{loc:>06o}|");
     } else {
         print!("{:7}", "");
     }
@@ -113,7 +113,7 @@ fn disassemble_word(loc: Unsigned18Bit, w: Unsigned36Bit, is_origin: bool) {
         }
     }
     let (left, right) = split_halves(w);
-    println!("|{:>06o} {:>06o}|{:>6o}", left, right, loc);
+    println!("|{left:>06o} {right:>06o}|{loc:>6o}");
 }
 
 fn disassemble_chunk<R: Read>(input: &mut R, checksum: &mut Signed18Bit) -> Result<bool, Fail> {
@@ -134,7 +134,7 @@ fn disassemble_chunk<R: Read>(input: &mut R, checksum: &mut Signed18Bit) -> Resu
                 None => None,
             }
             .expect("overflow in block length");
-            println!("** {}-word chunk ending at {}", len, end);
+            println!("** {len}-word chunk ending at {end}");
             let u_origin = end
                 .checked_sub(len)
                 .and_then(|n| n.checked_add(Unsigned18Bit::ONE))
@@ -155,11 +155,10 @@ fn disassemble_chunk<R: Read>(input: &mut R, checksum: &mut Signed18Bit) -> Resu
     {
         let unsigned_checksum = checksum.reinterpret_as_unsigned();
         if unsigned_checksum.is_zero() {
-            println!("** Checksum is valid: {:>06o}", unsigned_checksum);
+            println!("** Checksum is valid: {unsigned_checksum:>06o}");
         } else {
             println!(
-                "** Checksum is not valid: {:>06o}, this tape cannot be loaded as-is",
-                unsigned_checksum
+                "** Checksum is not valid: {unsigned_checksum:>06o}, this tape cannot be loaded as-is",
             );
         }
     }
@@ -169,7 +168,7 @@ fn disassemble_chunk<R: Read>(input: &mut R, checksum: &mut Signed18Bit) -> Resu
         println!("** This is the final block");
         Ok(false)
     } else {
-        eprintln!("warning: block has unexpected next-address {:o}", next);
+        eprintln!("warning: block has unexpected next-address {next:o}");
         Ok(false)
     }
 }
@@ -181,8 +180,7 @@ fn check_header<R: Read>(input: &mut R) -> Result<(), Fail> {
         if want != got {
             return Err(Fail::Generic(
                 format!(
-                    "File does not begin with the expected header; at position {} we expected {:>012o} but got {:>012o}",
-                    pos, want, got)));
+                    "File does not begin with the expected header; at position {pos} we expected {want:>012o} but got {got:>012o}")));
         }
     }
     println!("** reader leader is valid:");
@@ -195,7 +193,7 @@ fn disassemble_file(input_file_name: &OsStr) -> Result<(), Fail> {
     let input_file = OpenOptions::new()
         .read(true)
         .open(input_file_name)
-        .map_err(|e| Fail::Generic(format!("failed to open input file: {}", e)))?;
+        .map_err(|e| Fail::Generic(format!("failed to open input file: {e}")))?;
     let mut reader = BufReader::new(input_file);
     check_header(&mut reader)?;
     let mut checksum: Signed18Bit = Signed18Bit::ZERO;
@@ -249,7 +247,7 @@ fn disassemble() -> Result<(), Fail> {
     {
         Err(e) => {
             return Err(Fail::Generic(
-                format!("failed to initialise tracing filter (perhaps there is a problem with environment variables): {}", e)));
+                format!("failed to initialise tracing filter (perhaps there is a problem with environment variables): {e}")));
         }
         Ok(layer) => layer,
     };
@@ -267,7 +265,7 @@ fn disassemble() -> Result<(), Fail> {
 fn main() {
     match disassemble() {
         Err(e) => {
-            eprintln!("error: {}", e);
+            eprintln!("error: {e}");
             std::process::exit(1);
         }
         Ok(()) => {

assembler/src/tx2m4as/main.rs

@@ -44,7 +44,7 @@ fn run_asembler() -> Result<(), Fail> {
     {
         Err(e) => {
             return Err(Fail::InitialisationFailure(
-                format!("failed to initialise tracing filter (perhaps there is a problem with environment variables): {}", e)));
+                format!("failed to initialise tracing filter (perhaps there is a problem with environment variables): {e}")));
         }
         Ok(layer) => layer,
     };
@@ -72,7 +72,7 @@ fn main() {
 
     match run_asembler() {
         Err(e) => {
-            eprintln!("{}", e);
+            eprintln!("{e}");
             std::process::exit(1);
         }
         Ok(()) => {

assembler/src/tx2maketape/main.rs

@@ -171,7 +171,7 @@ fn run_utility() -> Result<(), Fail> {
     let input_file = OpenOptions::new()
         .read(true)
         .open(cli.input)
-        .map_err(|e| Fail(format!("failed to open input file: {}", e)))?;
+        .map_err(|e| Fail(format!("failed to open input file: {e}")))?;
     let binary = read_binary(input_file)?;
 
     let output_path = PathBuf::from(cli.output);
@@ -192,7 +192,7 @@ fn run_utility() -> Result<(), Fail> {
 fn main() {
     match run_utility() {
         Err(e) => {
-            eprintln!("{}", e);
+            eprintln!("{e}");
             std::process::exit(1);
         }
         Ok(()) => {

assembler/tests/hello-golden.rs

@@ -39,8 +39,7 @@ fn files_are_identical(expected: &OsStr, got: &OsStr) -> Result<(), String> {
     let got_file_len = got_file.metadata().expect(COMPLAIN).len();
     if expected_file_len != got_file_len {
         return Err(format!(
-            "wrong file length: {:?} is {} bytes but {:?} is {} bytes",
-            expected, expected_file_len, got, got_file_len
+            "wrong file length: {expected:?} is {expected_file_len} bytes but {got:?} is {got_file_len} bytes",
         ));
     }