1 |
commit: 8e89e2f2bccb7351e0d87b772e7dfba0ba815282 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Fri Jan 14 18:07:18 2022 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 14 21:12:48 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e89e2f2 |
7 |
|
8 |
sys-devel/rust-std: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/23798 |
13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
14 |
|
15 |
.../rust-std/files/1.51.0-bootstrap-panic.patch | 43 ---------------------- |
16 |
1 file changed, 43 deletions(-) |
17 |
|
18 |
diff --git a/sys-devel/rust-std/files/1.51.0-bootstrap-panic.patch b/sys-devel/rust-std/files/1.51.0-bootstrap-panic.patch |
19 |
deleted file mode 100644 |
20 |
index 529d5a1f402f..000000000000 |
21 |
--- a/sys-devel/rust-std/files/1.51.0-bootstrap-panic.patch |
22 |
+++ /dev/null |
23 |
@@ -1,43 +0,0 @@ |
24 |
-From 31c93397bde772764cda3058e16f9cef61895090 Mon Sep 17 00:00:00 2001 |
25 |
-From: Joshua Nelson <jyn514@×××××.com> |
26 |
-Date: Mon, 8 Feb 2021 22:51:21 -0500 |
27 |
-Subject: [PATCH] Use format string in bootstrap panic instead of a string |
28 |
- directly |
29 |
- |
30 |
-This fixes the following warning when compiling with nightly: |
31 |
- |
32 |
-``` |
33 |
-warning: panic message is not a string literal |
34 |
- --> src/bootstrap/builder.rs:1515:24 |
35 |
- | |
36 |
-1515 | panic!(out); |
37 |
- | ^^^ |
38 |
- | |
39 |
- = note: `#[warn(non_fmt_panic)]` on by default |
40 |
- = note: this is no longer accepted in Rust 2021 |
41 |
-help: add a "{}" format string to Display the message |
42 |
- | |
43 |
-1515 | panic!("{}", out); |
44 |
- | ^^^^^ |
45 |
-help: or use std::panic::panic_any instead |
46 |
- | |
47 |
-1515 | std::panic::panic_any(out); |
48 |
- | ^^^^^^^^^^^^^^^^^^^^^^ |
49 |
-``` |
50 |
---- |
51 |
- src/bootstrap/builder.rs | 2 +- |
52 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
53 |
- |
54 |
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs |
55 |
-index f1a160250dbe1..0f5fcb4af400d 100644 |
56 |
---- a/src/bootstrap/builder.rs |
57 |
-+++ b/src/bootstrap/builder.rs |
58 |
-@@ -1490,7 +1490,7 @@ impl<'a> Builder<'a> { |
59 |
- for el in stack.iter().rev() { |
60 |
- out += &format!("\t{:?}\n", el); |
61 |
- } |
62 |
-- panic!(out); |
63 |
-+ panic!("{}", out); |
64 |
- } |
65 |
- if let Some(out) = self.cache.get(&step) { |
66 |
- self.verbose(&format!("{}c {:?}", " ".repeat(stack.len()), step)); |