Skip to content

Commit 8bfff0d

Browse files
authored
Consistently inline formatting arguments (#2413)
1 parent ce56ea5 commit 8bfff0d

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

src/bare-metal/aps/examples/src/main_minimal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extern "C" fn main(x0: u64, x1: u64, x2: u64, x3: u64) {
3535
// nothing else accesses that address range.
3636
let mut uart = unsafe { Uart::new(PL011_BASE_ADDRESS) };
3737

38-
writeln!(uart, "main({:#x}, {:#x}, {:#x}, {:#x})", x0, x1, x2, x3).unwrap();
38+
writeln!(uart, "main({x0:#x}, {x1:#x}, {x2:#x}, {x3:#x})").unwrap();
3939

4040
system_off::<Hvc>().unwrap();
4141
}

src/concurrency/async-control-flow/join.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ async fn main() {
3131
let results = future::join_all(futures_iter).await;
3232
let page_sizes_dict: HashMap<&str, Result<usize>> =
3333
urls.into_iter().zip(results.into_iter()).collect();
34-
println!("{:?}", page_sizes_dict);
34+
println!("{page_sizes_dict:?}");
3535
}
3636
```
3737

src/methods-and-traits/deriving.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn main() {
2020
let mut p2 = p1.clone(); // Clone trait adds `clone` method.
2121
p2.name = String::from("EldurScrollz");
2222
// Debug trait adds support for printing with `{:?}`.
23-
println!("{:?} vs. {:?}", p1, p2);
23+
println!("{p1:?} vs. {p2:?}");
2424
}
2525
```
2626

src/pattern-matching/exercise.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,6 @@ fn main() {
130130
left: Box::new(Expression::Value(20)),
131131
right: Box::new(Expression::Value(10)),
132132
};
133-
println!("expr: {:?}", expr);
133+
println!("expr: {expr:?}");
134134
println!("result: {:?}", eval(expr));
135135
}

src/pattern-matching/let-control-flow.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ lets you execute different code depending on whether a value matches a pattern:
2121
use std::time::Duration;
2222
2323
fn sleep_for(secs: f32) {
24-
if let Ok(dur) = Duration::try_from_secs_f32(secs) {
25-
std::thread::sleep(dur);
26-
println!("slept for {:?}", dur);
24+
if let Ok(duration) = Duration::try_from_secs_f32(secs) {
25+
std::thread::sleep(duration);
26+
println!("slept for {duration:?}");
2727
}
2828
}
2929

src/std-traits/operators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl std::ops::Add for Point {
2424
fn main() {
2525
let p1 = Point { x: 10, y: 20 };
2626
let p2 = Point { x: 100, y: 200 };
27-
println!("{:?} + {:?} = {:?}", p1, p2, p1 + p2);
27+
println!("{p1:?} + {p2:?} = {:?}", p1 + p2);
2828
}
2929
```
3030

src/std-traits/read-and-write.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn main() -> Result<()> {
3838
let mut buffer = Vec::new();
3939
log(&mut buffer, "Hello")?;
4040
log(&mut buffer, "World")?;
41-
println!("Logged: {:?}", buffer);
41+
println!("Logged: {buffer:?}");
4242
Ok(())
4343
}
4444
```

src/unsafe-rust/exercise.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl DirectoryIterator {
9191
// SAFETY: path.as_ptr() cannot be NULL.
9292
let dir = unsafe { ffi::opendir(path.as_ptr()) };
9393
if dir.is_null() {
94-
Err(format!("Could not open {:?}", path))
94+
Err(format!("Could not open {path:?}"))
9595
} else {
9696
Ok(DirectoryIterator { path, dir })
9797
}

src/user-defined-types/enums.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ enum PlayerMove {
2222
}
2323
2424
fn main() {
25-
let m: PlayerMove = PlayerMove::Run(Direction::Left);
26-
println!("On this turn: {:?}", m);
25+
let player_move: PlayerMove = PlayerMove::Run(Direction::Left);
26+
println!("On this turn: {player_move:?}");
2727
}
2828
```
2929

0 commit comments

Comments
 (0)