diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2021-02-10 12:24:26 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 12:24:26 +0900 |
| commit | 812910898a34204d3b8deabc20189ebc9ff8cb0b (patch) | |
| tree | 6dbc1e15aa2e0bbd973fd132239d8b97c97f2bc3 | |
| parent | fff36f199a04e2e3908a2f98276c2613a837c620 (diff) | |
| parent | 31c93397bde772764cda3058e16f9cef61895090 (diff) | |
| download | rust-812910898a34204d3b8deabc20189ebc9ff8cb0b.tar.gz rust-812910898a34204d3b8deabc20189ebc9ff8cb0b.zip | |
Rollup merge of #81910 - jyn514:bootstrap-1.52, r=jackh726
Use format string in bootstrap panic instead of a string directly
This fixes the following warning when compiling with nightly:
```
warning: panic message is not a string literal
--> src/bootstrap/builder.rs:1515:24
|
1515 | panic!(out);
| ^^^
|
= note: `#[warn(non_fmt_panic)]` on by default
= note: this is no longer accepted in Rust 2021
help: add a "{}" format string to Display the message
|
1515 | panic!("{}", out);
| ^^^^^
help: or use std::panic::panic_any instead
|
1515 | std::panic::panic_any(out);
| ^^^^^^^^^^^^^^^^^^^^^^
```
Found while working on https://github.com/rust-lang/rust/pull/79540. cc https://github.com/rust-lang/rust/pull/81645, which landed in 1.51.
| -rw-r--r-- | src/bootstrap/builder.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 6ab106f3024..8fddd8cba08 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1512,7 +1512,7 @@ impl<'a> Builder<'a> { for el in stack.iter().rev() { out += &format!("\t{:?}\n", el); } - panic!(out); + panic!("{}", out); } if let Some(out) = self.cache.get(&step) { self.verbose(&format!("{}c {:?}", " ".repeat(stack.len()), step)); |
