From 4f3380de39100600462aacbffe489154bc4b7cb9 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sat, 27 Mar 2021 17:50:54 +1100 Subject: [PATCH] rust: 1.50.0 -> 1.51.0 --- rust/.footprint | 61 ++++++++++++++++++++++++-- rust/.signature | 14 +++--- rust/Pkgfile | 17 ++++--- rust/rust-1.51.0-bootstrap_panic.patch | 43 ++++++++++++++++++ 4 files changed, 120 insertions(+), 15 deletions(-) create mode 100644 rust/rust-1.51.0-bootstrap_panic.patch diff --git a/rust/.footprint b/rust/.footprint index ac8a15cdf..d855f6141 100644 --- a/rust/.footprint +++ b/rust/.footprint @@ -17,7 +17,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/rustdoc -rwxr-xr-x root/root usr/bin/rustfmt drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/cargo-credential-1password drwxr-xr-x root/root usr/lib/rustlib/ drwxr-xr-x root/root usr/lib/rustlib/etc/ -rw-r--r-- root/root usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py @@ -124,7 +123,22 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/sync/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/sync/tests.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/task.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/tests.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec.rs +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/cow.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/drain.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/drain_filter.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/in_place_drop.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/into_iter.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/is_zero.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/mod.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/partial_eq.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/set_len_on_drop.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/source_iter_marker.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/spec_extend.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/spec_from_elem.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/spec_from_iter.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/spec_from_iter_nested.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/vec/splice.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/tests/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/tests/arc.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/tests/binary_heap.rs @@ -316,6 +330,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/flatten.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/fuse.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/inspect.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/intersperse.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/map.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/map_while.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/adapters/mod.rs @@ -446,6 +461,10 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/str/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/str/pattern.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/str/traits.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/str/validations.rs +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/stream/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/stream/mod.rs +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/stream/stream/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/stream/stream/mod.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/sync/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/sync/atomic.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/sync/mod.rs @@ -473,6 +492,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/char.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/clone.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/cmp.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/const_ptr.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/fmt/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/fmt/builders.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/fmt/float.rs @@ -482,7 +502,39 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/hash/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/hash/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/hash/sip.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/intrinsics.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter.rs +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/iter/ +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/chain.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/cloned.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/copied.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/cycle.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/enumerate.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/filter.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/filter_map.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/flat_map.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/flatten.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/fuse.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/inspect.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/intersperse.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/map.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/mod.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/peekable.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/scan.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/skip.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/skip_while.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/step_by.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/take.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/take_while.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/adapters/zip.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/mod.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/range.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/sources.rs +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/iter/traits/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/traits/accum.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/traits/double_ended.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/traits/iterator.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/traits/mod.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/iter/traits/step.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/lazy.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/lib.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/macros.rs @@ -510,6 +562,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/num/flt2dec/str -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/int_macros.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/nan.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/ops.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/u128.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/u16.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/u32.rs @@ -632,7 +685,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/ffi/os_str/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/fs.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/fs/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/fs/tests.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/future.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/bufreader.rs @@ -1527,6 +1579,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/li -rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/remember_state_leak.pass.sh.s -rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/signal_frame.pass.cpp -rw-r--r-- root/root usr/lib/rustlib/src/rust/src/llvm-project/libunwind/test/unw_getcontext.pass.cpp +drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/ drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/ -rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-llvm-dwp drwxr-xr-x root/root usr/share/ diff --git a/rust/.signature b/rust/.signature index a92adb80f..f80fffad5 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,9 +1,11 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/TochbocwXARcriKxA94YCqTlp2E5bQYWmXJvw34cdjDdQiAi+HHIRnQnevCDW8VXkyg+jqWc06UIqdTsNyQeAU= -SHA256 (Pkgfile) = 20b839132f12ff9a80f0dba93cf920e86f9ca695672216993dc63ce79d0c8faa -SHA256 (.footprint) = ab2487136df2b78838a3e46a6d560bd80e33c1097bc1af0374dc362f82297597 -SHA256 (rustc-1.50.0-src.tar.xz) = f54adf9204ed3cb3998cdc1baa5645b346d8cf8f18205e3b15fcae194ba5457c -SHA256 (rust-std-1.49.0-x86_64-unknown-linux-gnu.tar.xz) = 638c3983ad20f9b9e1f49da1c64ac681eec5cf705fee1089f052de4c09b05c2b -SHA256 (rustc-1.49.0-x86_64-unknown-linux-gnu.tar.xz) = faa6c7c477284f4e0ef87e19cd5696844b1b079fbf14cefe369eaba8470dd861 +RWSE3ohX2g5d/f/9W2vKk7Zg/zC8FLrnKTiX6SqyzUTkK9Q6pilhjshT9e19LDrWSxDnOJT+b7Ww3sno3NIVZt32EYq+O1pZ4AE= +SHA256 (Pkgfile) = b769331fb4fedbdf0ec54b6b1e500ad056da81af851f6fdaf4d6649531aa1055 +SHA256 (.footprint) = f17fdd266ee46f95fe963f63d349fff8496d33b1c21f8bdc1da1e7dbf682c3d1 +SHA256 (rustc-1.51.0-src.tar.xz) = 92c68a91fca33cbafb83442cde722d010cc387dc1ee8a2680e2fb33a575821a1 +SHA256 (rust-std-1.50.0-x86_64-unknown-linux-gnu.tar.xz) = f1eb68db2b28a56ed8701edba7cf3688011d903ca12ff9d85bd21d3f8f614792 +SHA256 (rustc-1.50.0-x86_64-unknown-linux-gnu.tar.xz) = 9bebd360bcd9b5bb58f2a02930b9db4ae291adef259c96377f1f4cbd240bcf86 +SHA256 (cargo-1.50.0-x86_64-unknown-linux-gnu.tar.xz) = 3cb2c68e987e5681fca9c930973f408a71151b1b255e69669a08e54d446ee803 SHA256 (compiler-rt-11.1.0.src.tar.xz) = def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274 SHA256 (libexec.patch) = 9ba3070dbc877ab5e045b6a20be9134f80d8aece42766b4cfbad2a4a60c27514 +SHA256 (rust-1.51.0-bootstrap_panic.patch) = abc04420085583d10ea1e1c766113cd10f4f35ba42c8b52ce8c234cbe01287ce diff --git a/rust/Pkgfile b/rust/Pkgfile index 028ab0298..3e0a8c509 100644 --- a/rust/Pkgfile +++ b/rust/Pkgfile @@ -5,16 +5,19 @@ # Optional: sccache ccache name=rust -version=1.50.0 -_date=2020-12-31 -_rustc=1.49.0 +version=1.51.0 +_date=2021-02-11 +_rustc=1.50.0 +_cargo=$_rustc _llvm=11.1.0 -release=2 +release=1 source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz https://static.rust-lang.org/dist/$_date/rust-std-$_rustc-x86_64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/$_date/rustc-$_rustc-x86_64-unknown-linux-gnu.tar.xz + https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-gnu.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm/compiler-rt-$_llvm.src.tar.xz - libexec.patch) + libexec.patch + rust-1.51.0-bootstrap_panic.patch) unpack_source() { for file in ${source[@]}; do @@ -38,6 +41,10 @@ build() { # Patch cargo so credential helpers are in /usr/lib instead of /usr/libexec patch -p1 -i $SRC/libexec.patch + # https://github.com/rust-lang/rust/pull/81910 + # https://github.com/rust-lang/rust/commit/31c93397bde772764cda3058e16f9cef61895090 + patch -p1 -i $SRC/rust-1.51.0-bootstrap_panic.patch + local ERROR local DATE="$(awk '/^date: / { print $2 }' src/stage0.txt)" local RUSTC="$(awk '/^rustc: / { print $2 }' src/stage0.txt)" diff --git a/rust/rust-1.51.0-bootstrap_panic.patch b/rust/rust-1.51.0-bootstrap_panic.patch new file mode 100644 index 000000000..529d5a1f4 --- /dev/null +++ b/rust/rust-1.51.0-bootstrap_panic.patch @@ -0,0 +1,43 @@ +From 31c93397bde772764cda3058e16f9cef61895090 Mon Sep 17 00:00:00 2001 +From: Joshua Nelson +Date: Mon, 8 Feb 2021 22:51:21 -0500 +Subject: [PATCH] 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); + | ^^^^^^^^^^^^^^^^^^^^^^ +``` +--- + src/bootstrap/builder.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs +index f1a160250dbe1..0f5fcb4af400d 100644 +--- a/src/bootstrap/builder.rs ++++ b/src/bootstrap/builder.rs +@@ -1490,7 +1490,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));