commit 8fe49a91c77c35e3ac306a8e856d83d8413bc2a1 Author: Tim Biermann <tbier@posteo.de> Date: Fri Sep 23 07:54:51 2022 +0200 rust: 1.63.0 -> 1.64.0 diff --git a/rust/.footprint b/rust/.footprint index 987695dd9..f3d412e4b 100644 --- a/rust/.footprint +++ b/rust/.footprint @@ -7,6 +7,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/cargo-clippy -rwxr-xr-x root/root usr/bin/cargo-fmt -rwxr-xr-x root/root usr/bin/clippy-driver +-rwxr-xr-x root/root usr/bin/rust-analyzer -rwxr-xr-x root/root usr/bin/rust-demangler -rwxr-xr-x root/root usr/bin/rust-gdb -rwxr-xr-x root/root usr/bin/rust-gdbgui @@ -33,6 +34,7 @@ drwxr-xr-x root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/ -rw-r--r-- root/root usr/lib/rustlib/manifest-clippy-preview -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-analysis-i686-unknown-linux-gnu -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-analysis-x86_64-unknown-linux-gnu +-rw-r--r-- root/root usr/lib/rustlib/manifest-rust-analyzer-preview -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-demangler-preview -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-src -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-std-i686-unknown-linux-gnu @@ -441,6 +443,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/mem/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/mem/manually_drop.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/mem/maybe_uninit.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/mem/mod.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/mem/transmutability.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/mem/valid_align.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/num/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/num/bignum.rs @@ -547,6 +550,7 @@ 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/validations.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/exclusive.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/sync/mod.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/task/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/task/mod.rs @@ -721,8 +725,13 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/examples/nbody.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/examples/spectral_norm.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/comparisons.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/core_simd_docs.md +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/elements.rs +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/elements/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/elements/float.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/elements/int.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/elements/uint.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/eq.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/fmt.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/intrinsics.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/iter.rs @@ -733,15 +742,13 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/masks/bitmask.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/masks/full_masks.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/masks/to_bitmask.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/math.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ops.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ops/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ops/assign.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ops/deref.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ops/unary.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/reduction.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/round.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ord.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/select.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/swizzle.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/to_bytes.rs @@ -802,15 +809,18 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/proc_macro/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/Cargo.toml drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/proc_macro/src/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/arena.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/buffer.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/client.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/closure.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/fxhash.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/handle.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/rpc.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/scoped_cell.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/selfless_reify.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/server.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/symbol.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/diagnostic.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/lib.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/quote.rs @@ -891,6 +901,8 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/fs/ 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 +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/bufreader/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/bufreader/buffer.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/bufwriter.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/linewriter.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/linewritershim.rs @@ -1180,6 +1192,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/time.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/time/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/time/tests.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/wait_flag.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/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/ @@ -1263,7 +1276,9 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/kernel_co -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/kernel_copy/tests.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/l4re.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/futex.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/fuchsia_mutex.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/futex_condvar.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/futex_mutex.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/futex_rwlock.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/pthread_condvar.rs @@ -1421,6 +1436,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/futex.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/generic.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/mod.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/wait_flag.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/tests.rs @@ -1868,6 +1884,8 @@ drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/ -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a +drwxr-xr-x root/root usr/libexec/ +-rwxr-xr-x root/root usr/libexec/rust-analyzer-proc-macro-srv drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/rust/.signature b/rust/.signature index e92828bee..5b868bc77 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,11 +1,11 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SjYTIUpASwTp7N8dRuPhuyXhvyuQs3mMfOnyL+wBqQKAj8XGOOfZ81Gq45Ey6nHLjqxRs73Xih9TKk5zXoghgQ= -SHA256 (Pkgfile) = 9089bbeea5d3b308dd775cf96a97ddb9af196229eced2bb1307577da5e728929 -SHA256 (.footprint) = 61127f3edf08faf27f567db548c7cfc2fb6a4c3ae3da2e26c2e641272697efe3 -SHA256 (rustc-1.63.0-src.tar.xz) = 8f44af6dc44cc4146634a4dd5e4cc5470b3052a2337019b870c0e025e8987e0c -SHA256 (rust-std-1.62.0-x86_64-unknown-linux-gnu.tar.xz) = addfae87b6b1b521d98a50fdc5120990888a51bb397100062e9c558267c67c77 -SHA256 (rustc-1.62.0-x86_64-unknown-linux-gnu.tar.xz) = e7f71f4ef09334ddc9ec8cbf2f958d654e36f580c95f8fec6d5c816ce256dbd6 -SHA256 (cargo-1.62.0-x86_64-unknown-linux-gnu.tar.xz) = 815c63119a9cf0282ff240c6444b6f867238763ee3dea182f10837ae7dbbb1d4 +RWSE3ohX2g5d/ZvyLwlth3nKSF/v9Y/NOSUGVx79QhXH8e5nBc+C129FwBvwq12xMdrB6Rf7z16ODQADqXLsedA8EYs2Y4iyIg0= +SHA256 (Pkgfile) = 8c3a9fda9ec44b2ed53d53e67d1f7b68b8f22199ce1e31325616a9426d01e9c9 +SHA256 (.footprint) = 76b27a8f6a2e8e8eedffb8a8c724b04e41b36895749280bfdd89a625468094e2 +SHA256 (rustc-1.64.0-src.tar.xz) = e8170d318fac9d2fc17d5c3e648e7068f56e8db8d233d864aeffbef7c6542eac +SHA256 (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = 993c2c17bf76ac626bfb5b17bddce65fbdfc14f70d183f33773de0cd12df46d2 +SHA256 (rustc-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = bdab9d9afa5c329c40f9ba568364815237fab8426477c12bfabad35ffc484ab5 +SHA256 (cargo-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = f370d12e4c11f0c835becb738bcf00d363f29b76f8b424b4dcb005abcf15fc9a SHA256 (0001-bootstrap-Change-libexec-dir.patch) = 60c6dfc100d292284af2187cfefc1d0d928139ca557d27bc6bef88edefccff70 SHA256 (0001-cargo-Change-libexec-dir.patch) = c901a9bb036c29ca092f7dbc8b447efdd9aa1044a902a88f9d024cb22681dc19 SHA256 (0002-compiler-Change-LLVM-targets.patch) = 8dcb566da29a92ecf3eb6afe094d9c7766d08230d90fd666bfd022c018ae676a diff --git a/rust/Pkgfile b/rust/Pkgfile index 6ce70f67e..661286a53 100644 --- a/rust/Pkgfile +++ b/rust/Pkgfile @@ -5,9 +5,9 @@ # Optional: ccache libgit2 lld polly sccache name=rust -version=1.63.0 -_date=2022-06-30 -_rustc=1.62.0 +version=1.64.0 +_date=2022-08-11 +_rustc=1.63.0 _cargo=$_rustc release=1 @@ -66,6 +66,8 @@ build() { patch -p1 -i $SRC/0001-bootstrap-Change-libexec-dir.patch patch -p1 -d src/tools/cargo -i $SRC/0001-cargo-Change-libexec-dir.patch + sed -e 's/libexec/lib/g' -i src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs + # Use our *-pc-linux-gnu targets, making LTO with clang simpler patch -p1 -i $SRC/0002-compiler-Change-LLVM-targets.patch @@ -99,7 +101,7 @@ cat <<- EOF > $SRC/config.toml [build] target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] - tools = ["cargo", "clippy", "rustfmt", "analysis", "src", "rust-demangler"] + tools = ["cargo", "clippy", "rustfmt", "analysis", "src", "rust-demangler", "rust-analyzer"] docs = false extended = true sanitizers = true @@ -113,6 +115,16 @@ cat <<- EOF > $SRC/config.toml [target.x86_64-unknown-linux-gnu] llvm-config = "/usr/bin/llvm-config" llvm-filecheck = "/usr/bin/FileCheck" + cc = "/usr/bin/gcc" + cxx = "/usr/bin/g++" + ar = "/usr/bin/gcc-ar" + ranlib = "/usr/bin/gcc-ranlib" + + [target.i686-unknown-linux-gnu] + cc = "/usr/bin/gcc" + cxx = "/usr/bin/g++" + ar = "/usr/bin/gcc-ar" + ranlib = "/usr/bin/gcc-ranlib" EOF if [ -e '/usr/bin/rustc' ]; then