From 1e28694ba4e82437d9889174c34b22cd782b6028 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Fri, 18 Jun 2021 22:47:56 +1000 Subject: [PATCH] rust: 1.52.1 -> 1.53.0 --- rust/.footprint | 45 +++++++++++++++-------------- rust/.signature | 15 +++++----- rust/1.53.0-miri-vergen.patch | 53 +++++++++++++++++++++++++++++++++++ rust/Pkgfile | 14 +++++---- 4 files changed, 94 insertions(+), 33 deletions(-) create mode 100644 rust/1.53.0-miri-vergen.patch diff --git a/rust/.footprint b/rust/.footprint index fa1b99c16..458e61693 100644 --- a/rust/.footprint +++ b/rust/.footprint @@ -231,6 +231,12 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/coff.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/elf.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/libs_dl_iterate_phdr.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/libs_haiku.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/libs_illumos.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/libs_libnx.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/libs_macos.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/libs_windows.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/macho.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/mmap_fake.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/backtrace/src/symbolize/gimli/mmap_unix.rs @@ -428,6 +434,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/ops/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ops/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ops/range.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ops/try.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ops/try_trait.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ops/unsize.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/option.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/panic.rs @@ -566,6 +573,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/i32.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/i64.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/i8.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/num/ieee754.rs -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 @@ -595,6 +603,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/ops/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/panic_abort/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/panic_abort/Cargo.toml drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/panic_abort/src/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/panic_abort/src/android.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/panic_abort/src/lib.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/panic_unwind/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/panic_unwind/Cargo.toml @@ -878,14 +887,17 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sync/mutex/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/once.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sync/once/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/once/tests.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/poison.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/rwlock.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sync/rwlock/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/rwlock/tests.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/ +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/common/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/common/alloc.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/common/mod.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/alloc.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/args.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/cmath.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/condvar.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/env.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/ext/ @@ -893,19 +905,15 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/ext/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/ext/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/fd.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/fs.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/io.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/memchr.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/mutex.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/net.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/os.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/path.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/rwlock.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/stack_overflow.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/stdio.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/thread.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/thread_local_dtor.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/thread_local_key.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/hermit/time.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/mod.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ @@ -927,7 +935,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/userca -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/usercalls/raw.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/alloc.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/args.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/cmath.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/condvar.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/env.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ext/ @@ -945,7 +952,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ext/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/rwlock.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/rwlock/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/rwlock/tests.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/stack_overflow.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/stdio.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/thread.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/thread_local_key.rs @@ -1014,6 +1020,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/p -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_unix.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_unix/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_unix/tests.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/process_vxworks.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/zircon.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/rand.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/rwlock.rs @@ -1027,7 +1034,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/process/p drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/alloc.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/args.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/cmath.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/common.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/condvar.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/env.rs @@ -1040,20 +1046,11 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/pipe.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/process.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/rwlock.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/stack_overflow.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/stdio.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/thread.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/thread_local_dtor.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/thread_local_key.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unsupported/time.rs -drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/env.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/mod.rs -drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/process/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/process/mod.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/process/process_vxworks.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/rand.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/vxworks/thread_local_dtor.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/args.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasi/env.rs @@ -1083,6 +1080,8 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/wasm/thread.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/alloc.rs +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/alloc/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/alloc/tests.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/args.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/args/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/args/tests.rs @@ -1129,8 +1128,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/proces -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/thread_parker.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/time.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/alloc.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/at_exit_imp.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/backtrace.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/bytestring.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/bytestring/ @@ -1146,11 +1143,11 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/condvar drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/net/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/net/tests.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/os_str_bytes.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/poison.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/process.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/remutex.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/remutex/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/remutex/tests.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/rt.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/rwlock.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/tests.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread.rs @@ -1256,6 +1253,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/README.md -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/avx512bw.md -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/avx512f.md +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/avx512vbmi2.md -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/build.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/rustfmt.toml drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/ @@ -1332,6 +1330,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/s -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/aes.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx2.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512bf16.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512bitalg.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512bw.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512cd.rs @@ -1339,6 +1338,9 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/s -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512gfni.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512ifma.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512vaes.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512vbmi.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512vbmi2.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512vnni.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512vpclmulqdq.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/avx512vpopcntdq.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86/bmi1.rs @@ -1379,6 +1381,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/s -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86_64/bt.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86_64/cmpxchg16b.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86_64/fxsr.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86_64/macros.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86_64/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86_64/rdrand.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/x86_64/sse.rs @@ -1437,7 +1440,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/linux-x64-i7-6850k.auxv -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/macos-virtualbox-linux-x86-4850HQ.auxv -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/lib.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/mod.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/tests/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/tests/cpu-detection.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/tests/macro_trailing_commas.rs @@ -1468,6 +1470,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/stdarch-ver -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/stdarch-verify/x86-intel.xml drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/examples/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/examples/Cargo.toml +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/examples/connect5.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/examples/hex.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/examples/wasm.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/triagebot.toml diff --git a/rust/.signature b/rust/.signature index c91fd858d..92f2378c5 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,9 +1,10 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Xzd35nF0rD/0RP187e8NK+8R8QCvkwf9t1v3eU6kZjdYjcsRPSKXgG+2WQaBbROmEFC/BR1n7tkt/u4ohG+IQ4= -SHA256 (Pkgfile) = 4a7ea574e4854cc94134bdb31d1d65435957f275e215539f4af7dd73416cb39b -SHA256 (.footprint) = dfcdcabb62f1272ade84727f6aff3f54324d4e176dbd0833b57373168f7b561a -SHA256 (rustc-1.52.1-src.tar.xz) = 521bbaebce262264e44acb164d327cba27acf6f08bd7de672d8d1e16e7ed959e -SHA256 (rust-std-1.51.0-x86_64-unknown-linux-gnu.tar.xz) = 1199ba8351bb88166050c0fb15a55a23b20b6ead098d7637aaca53b91c5e68ca -SHA256 (rustc-1.51.0-x86_64-unknown-linux-gnu.tar.xz) = feef13f6cd5072f30e2c121b7775d7ac5316998fcf03b68b2537684f3a7fe24a -SHA256 (cargo-1.51.0-x86_64-unknown-linux-gnu.tar.xz) = 2c557e448c145ed773baae0d6533449947bb130f8f8a2a0876d08f55b74a313f +RWSE3ohX2g5d/Qs9rCUE6aAzTtwtzgaFmCxhFzpYh2n9pO9mtXli0pkEuSTjsH93jAeI+PqfYXJJIIWrQP4BCxgwJ9/o2jecxQM= +SHA256 (Pkgfile) = db3ae4f33630220aaec23ab0f3fe1c2fef4bbdae9d8e9ed1b18d2cb29c79b5c3 +SHA256 (.footprint) = 0bfea3e1f330a808d5803ff73ef1e9c116836af1bab245a20c6d3be37b342f9b +SHA256 (rustc-1.53.0-src.tar.xz) = e53a2df2c2c26f8929d551852eeae242b9a6167fba34481f92010b30def32dec +SHA256 (rust-std-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = dcdc0083facd6484527494ee5b8f72e040a095ab346bb658ce176be573d5c9b4 +SHA256 (rustc-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = a5ce7d951dbebd815530c3c571c193c24ae4b83bc1bf431845c0dbfbe1280476 +SHA256 (cargo-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = d0931a1e728afdfbe3390a2ff3a5256d1668402298a3a6c050ac65ad01c4db2b SHA256 (libexec.patch) = 9ba3070dbc877ab5e045b6a20be9134f80d8aece42766b4cfbad2a4a60c27514 +SHA256 (1.53.0-miri-vergen.patch) = 309835d35a77eab776b5e1262f7389e71b64cf0712cad64ae78ed6c0208b19a2 diff --git a/rust/1.53.0-miri-vergen.patch b/rust/1.53.0-miri-vergen.patch new file mode 100644 index 000000000..347f147c9 --- /dev/null +++ b/rust/1.53.0-miri-vergen.patch @@ -0,0 +1,53 @@ +From 64f128c45687d18d64fc6856a30fde585b007e00 Mon Sep 17 00:00:00 2001 +From: Ralf Jung +Date: Sat, 15 May 2021 14:17:30 +0200 +Subject: [PATCH] support building Miri outside a git repo + +--- + cargo-miri/bin.rs | 14 ++++++++------ + cargo-miri/build.rs | 2 +- + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/cargo-miri/bin.rs b/cargo-miri/bin.rs +index e29bdc771..84447b3a1 100644 +--- a/src/tools/miri/cargo-miri/bin.rs ++++ b/src/tools/miri/cargo-miri/bin.rs +@@ -6,6 +6,7 @@ use std::io::{self, BufRead, BufReader, BufWriter, Read, Write}; + use std::ops::Not; + use std::path::{Path, PathBuf}; + use std::process::Command; ++use std::fmt::{Write as _}; + + use serde::{Deserialize, Serialize}; + +@@ -90,12 +91,13 @@ fn show_help() { + } + + fn show_version() { +- println!( +- "miri {} ({} {})", +- env!("CARGO_PKG_VERSION"), +- env!("VERGEN_GIT_SHA_SHORT"), +- env!("VERGEN_GIT_COMMIT_DATE") +- ); ++ let mut version = format!("miri {}", env!("CARGO_PKG_VERSION")); ++ // Only use `option_env` on vergen variables to ensure the build succeeds ++ // when vergen failed to find the git info. ++ if let Some(sha) = option_env!("VERGEN_GIT_SHA_SHORT") { ++ write!(&mut version, " ({} {})", sha, option_env!("VERGEN_GIT_COMMIT_DATE").unwrap()).unwrap(); ++ } ++ println!("{}", version); + } + + fn show_error(msg: String) -> ! { +diff --git a/cargo-miri/build.rs b/cargo-miri/build.rs +index cff135fe4..ebd8e7003 100644 +--- a/src/tools/miri/cargo-miri/build.rs ++++ b/src/tools/miri/cargo-miri/build.rs +@@ -7,5 +7,5 @@ fn main() { + let mut gen_config = vergen::Config::default(); + *gen_config.git_mut().sha_kind_mut() = vergen::ShaKind::Short; + *gen_config.git_mut().commit_timestamp_kind_mut() = vergen::TimestampKind::DateOnly; +- vergen(gen_config).expect("Unable to generate vergen keys!"); ++ vergen(gen_config).ok(); // Ignore failure (in case we are built outside a git repo) + } diff --git a/rust/Pkgfile b/rust/Pkgfile index ab2a04af3..081a5db0f 100644 --- a/rust/Pkgfile +++ b/rust/Pkgfile @@ -5,16 +5,17 @@ # Optional: sccache ccache name=rust -version=1.52.1 -_date=2021-03-25 -_rustc=1.51.0 +version=1.53.0 +_date=2021-05-06 +_rustc=1.52.0 _cargo=$_rustc 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 - libexec.patch) + libexec.patch + 1.53.0-miri-vergen.patch) unpack_source() { for file in ${source[@]}; do @@ -38,6 +39,9 @@ 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/issues/84182 + patch -p1 -i $SRC/1.53.0-miri-vergen.patch + local ERROR local DATE="$(awk '/^date: / { print $2 }' src/stage0.txt)" local RUSTC="$(awk '/^rustc: / { print $2 }' src/stage0.txt)" @@ -110,7 +114,7 @@ EOF export SCCACHE_IDLE_TIMEOUT='1500' fi - export RUST_BACKTRACE=1 + export RUST_BACKTRACE=full /usr/bin/python3 ./x.py build --config="${SRC}"/config.toml -j ${JOBS-1} DESTDIR=$PKG /usr/bin/python3 ./x.py --config="${SRC}"/config.toml install