summaryrefslogtreecommitdiff
path: root/rust
diff options
context:
space:
mode:
authorTim Biermann <tbier@posteo.de>2022-12-17 11:40:44 +0000
committerTim Biermann <tbier@posteo.de>2022-12-17 11:42:57 +0000
commit0e35c041fee88e0a939a480327c4ebd3e4a31170 (patch)
tree97e4cffd2feacc3b79842ce99b7add8507fef5cf /rust
parent91deadcca5745a81aa836ec05f05c8bca4881b02 (diff)
downloadopt-0e35c041fee88e0a939a480327c4ebd3e4a31170.tar.gz
opt-0e35c041fee88e0a939a480327c4ebd3e4a31170.tar.xz
rust: 1.65.0 -> 1.66.0
Diffstat (limited to 'rust')
-rw-r--r--rust/.footprint36
-rw-r--r--rust/.signature19
-rw-r--r--rust/0001-bootstrap-Change-libexec-dir.patch64
-rw-r--r--rust/0001-cargo-Change-libexec-dir.patch22
-rw-r--r--rust/0002-compiler-Change-LLVM-targets.patch18
-rw-r--r--rust/Pkgfile24
6 files changed, 104 insertions, 79 deletions
diff --git a/rust/.footprint b/rust/.footprint
index faf200440..4cf42fad3 100644
--- a/rust/.footprint
+++ b/rust/.footprint
@@ -158,6 +158,7 @@ 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/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/autotraits.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/tests/borrow.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/tests/boxed.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/tests/btree_set_hash.rs
@@ -345,6 +346,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/char/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/char/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/clone.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/cmp.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/const_closure.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/convert/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/convert/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/convert/num.rs
@@ -437,7 +439,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/iter/traits/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/traits/iterator.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/traits/marker.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/traits/mod.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/lazy.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/lib.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/macros/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/macros/mod.rs
@@ -448,7 +449,6 @@ 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/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
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/num/dec2flt/
@@ -504,6 +504,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/function.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ops/generator.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ops/index.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ops/index_range.rs
-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_trait.rs
@@ -522,6 +523,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/prelude/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/primitive.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/primitive_docs.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/ptr/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ptr/alignment.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ptr/const_ptr.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ptr/metadata.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/ptr/mod.rs
@@ -671,6 +673,9 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/num/flt2dec/str
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/ops/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/ops/control_flow.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/option.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/panic.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/tests/panic/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/panic/location.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/pattern.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/pin.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/tests/pin_macro.rs
@@ -935,7 +940,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/stdio/
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/util/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/util/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/keyword_docs.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/lazy.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/lib.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/macros.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/net/
@@ -1065,11 +1069,8 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/ffi/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/ffi/os_str.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/fs.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/io/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/io/fd.rs
-drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/io/fd/
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/io/fd/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/io/mod.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/io/raw.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/io/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/mod.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/unix/net/addr.rs
@@ -1101,6 +1102,10 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/wasi/io/fd/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/wasi/mod.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/wasi/net/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/wasi/net/mod.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/watchos/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/watchos/fs.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/watchos/mod.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/watchos/raw.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/ffi.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/windows/fs.rs
@@ -1181,6 +1186,8 @@ 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
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/common/small_c_string.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/common/tests.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
@@ -1329,6 +1336,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/thread_local_dtor.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/thread_local_key.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/thread_parker/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/thread_parker/darwin.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/thread_parker/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/thread_parker/netbsd.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/thread_parker/pthread.rs
@@ -1420,6 +1428,8 @@ 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.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/thread_local_dtor.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/thread_local_key.rs
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/thread_local_key/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/thread_local_key/tests.rs
-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/
@@ -1438,6 +1448,10 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/memchr/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/net.rs
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
+drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/once/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/once/futex.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/once/generic.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/once/mod.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/
@@ -1617,6 +1631,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/riscv64/mod.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/riscv_shared/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/riscv_shared/mod.rs
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/riscv_shared/p.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/simd.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/simd_llvm.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/core_arch/src/v64.rs
@@ -1739,8 +1754,11 @@ 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/os/windows/aarch64.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/os/x86.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/linux-artificial-aarch64.auxv
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/linux-empty-hwcap2-aarch64.auxv
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/linux-hwcap2-aarch64.auxv
+-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/linux-no-hwcap2-aarch64.auxv
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/src/detect/test_data/linux-rpi3.auxv
--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
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/stdarch/crates/std_detect/tests/
@@ -1783,7 +1801,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/test/src/formatters/
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/test/src/helpers/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/helpers/concurrency.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/helpers/exit_code.rs
--rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/helpers/isatty.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/helpers/metrics.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/helpers/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/test/src/helpers/shuffle.rs
@@ -1930,6 +1947,7 @@ drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/cargo-package.1.gz
-rw-r--r-- root/root usr/share/man/man1/cargo-pkgid.1.gz
-rw-r--r-- root/root usr/share/man/man1/cargo-publish.1.gz
+-rw-r--r-- root/root usr/share/man/man1/cargo-remove.1.gz
-rw-r--r-- root/root usr/share/man/man1/cargo-report.1.gz
-rw-r--r-- root/root usr/share/man/man1/cargo-run.1.gz
-rw-r--r-- root/root usr/share/man/man1/cargo-rustc.1.gz
diff --git a/rust/.signature b/rust/.signature
index a1d7d0c04..0d93e9603 100644
--- a/rust/.signature
+++ b/rust/.signature
@@ -1,11 +1,10 @@
untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/aD31oGoht61xP7Ry7lW2eerozzowD6k4CeBnLSopcGw5l4zJNTaJNuWppNCyPsNhBxgGfBkHaF/k0+gn8Vo1Qs=
-SHA256 (Pkgfile) = dc7f029ec4d52609b5c3cfbf8fccc89af2954219692bd43b042ddab84c7e07f9
-SHA256 (.footprint) = 3a831b96dc6981348c290e37fb02264ccc1bb61fd004fe77417f9f0531eaade4
-SHA256 (rustc-1.65.0-src.tar.xz) = 2d6aa2ea3fedd55acbbd65f78349385f9daa9c14e25db7a8df5d015588eee1cf
-SHA256 (rust-std-1.64.0-x86_64-unknown-linux-gnu.tar.xz) = 6ace34bcbba9557aa2fc3a0515c3da4a83ca24d7d45506c5e1b32f589fa38a8b
-SHA256 (rustc-1.64.0-x86_64-unknown-linux-gnu.tar.xz) = 1f5756a03119853b53358018c5b1592940a2354c3c9f84ee7faf684e3478f8f0
-SHA256 (cargo-1.64.0-x86_64-unknown-linux-gnu.tar.xz) = 21434d83a30ad3fa4e4831487c5574a20b07dd57d213b26e1246290c57d4ec41
-SHA256 (0001-bootstrap-Change-libexec-dir.patch) = c88389c7ac2ce832c39450171af8fbd9bfe26f8e683f28b776b492c972fda359
-SHA256 (0001-cargo-Change-libexec-dir.patch) = c901a9bb036c29ca092f7dbc8b447efdd9aa1044a902a88f9d024cb22681dc19
-SHA256 (0002-compiler-Change-LLVM-targets.patch) = 8dcb566da29a92ecf3eb6afe094d9c7766d08230d90fd666bfd022c018ae676a
+RWSE3ohX2g5d/SGZEAZxMEP8OJtRxx/5XrK3OUqhACNlpBsR6BpX5fpIUiAnMUibKpCU2yt9ZuGYIzjUV2AFSF9peL9imlJ4BQI=
+SHA256 (Pkgfile) = 839667442b6824a36d8b01e4c40edd617e510b553ab2eced724c2e29dcc18cf8
+SHA256 (.footprint) = 0da950d003add19e4655ab1302d77a283e38fc0d6460a82b31bcc98d05040f67
+SHA256 (rustc-1.66.0-src.tar.xz) = 0dc176e34fae9871f855a6ba4cb30fa19d69c5b4428d29281a07419c4950715c
+SHA256 (rust-std-1.65.0-x86_64-unknown-linux-gnu.tar.xz) = 2b588cd2d49688c0c33b7466614123e8fe4c910f4d802fc0ff0662b1772816a9
+SHA256 (rustc-1.65.0-x86_64-unknown-linux-gnu.tar.xz) = 62b89786e195fc5a8a262f83118d6689832b24228c9d303cba8ac14dc1e9adc8
+SHA256 (cargo-1.65.0-x86_64-unknown-linux-gnu.tar.xz) = 82547aacaf42fc3c2970ec31b96751dfbeba3dffe1a042a3780bd670c29a89bf
+SHA256 (0001-bootstrap-Change-libexec-dir.patch) = 874c96cb43a5cc1170674771705deb1c72e95ec5f6ede860cd658111db3cda48
+SHA256 (0002-compiler-Change-LLVM-targets.patch) = 4a4ff5c294acc0b1ca800856218770f6330a878acee72193aa456d82846a8a28
diff --git a/rust/0001-bootstrap-Change-libexec-dir.patch b/rust/0001-bootstrap-Change-libexec-dir.patch
index 8d81b3a9b..011d90ecf 100644
--- a/rust/0001-bootstrap-Change-libexec-dir.patch
+++ b/rust/0001-bootstrap-Change-libexec-dir.patch
@@ -4,15 +4,17 @@ Date: Thu, 6 May 2021 20:14:58 +0200
Subject: [PATCH] bootstrap: Change libexec dir
---
- src/bootstrap/dist.rs | 4 ++--
- src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ src/bootstrap/dist.rs | 4 ++--
+ src/bootstrap/tool.rs | 2 +-
+ .../crates/rust-analyzer/src/cli/load_cargo.rs | 2 +-
+ src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs | 6 ++----
+ 4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index 1a59b3958f10..6e650d286d8f 100644
+index 12585e80e6b7..eb596be98dca 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
-@@ -372,7 +372,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
+@@ -394,7 +394,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
target: compiler.host,
})
.expect("rust-analyzer-proc-macro-server always builds");
@@ -21,7 +23,7 @@ index 1a59b3958f10..6e650d286d8f 100644
let libdir_relative = builder.libdir_relative(compiler);
-@@ -980,7 +980,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+@@ -1003,7 +1003,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
let dirent = dirent.expect("read dir entry");
if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
@@ -30,16 +32,46 @@ index 1a59b3958f10..6e650d286d8f 100644
}
}
+diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
+index eec74b2675a1..4bf1d7348e43 100644
+--- a/src/bootstrap/tool.rs
++++ b/src/bootstrap/tool.rs
+@@ -781,7 +781,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
+
+ // Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/`
+ // so that r-a can use it.
+- let libexec_path = builder.sysroot(self.compiler).join("libexec");
++ let libexec_path = builder.sysroot(self.compiler).join("lib");
+ t!(fs::create_dir_all(&libexec_path));
+ builder.copy(&path, &libexec_path.join("rust-analyzer-proc-macro-srv"));
+
+diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/cli/load_cargo.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/cli/load_cargo.rs
+index 5dba545b8718..befaeb9e70db 100644
+--- a/src/tools/rust-analyzer/crates/rust-analyzer/src/cli/load_cargo.rs
++++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/cli/load_cargo.rs
+@@ -69,7 +69,7 @@ pub fn load_workspace(
+ if let Some(sysroot) = sysroot.as_ref() {
+ let standalone_server_name =
+ format!("rust-analyzer-proc-macro-srv{}", std::env::consts::EXE_SUFFIX);
+- let server_path = sysroot.root().join("libexec").join(&standalone_server_name);
++ let server_path = sysroot.root().join("lib").join(&standalone_server_name);
+ if std::fs::metadata(&server_path).is_ok() {
+ path = server_path;
+ args = vec![];
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs
-index e47f70fff39e..78c2a65aee8b 100644
+index e1f651786dee..77d6efca231e 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs
-@@ -321,7 +321,7 @@ fn eq_ignore_build_data<'a>(
- if let Some(sysroot) = sysroot.as_ref() {
- tracing::debug!("Found a cargo workspace with a sysroot...");
- let server_path =
-- sysroot.root().join("libexec").join(&standalone_server_name);
-+ sysroot.root().join("lib").join(&standalone_server_name);
- if std::fs::metadata(&server_path).is_ok() {
- tracing::debug!(
- "And the server exists at {}",
+@@ -322,10 +322,8 @@ fn eq_ignore_build_data<'a>(
+ | ProjectWorkspace::Json { sysroot, .. } = ws
+ {
+ if let Some(sysroot) = sysroot.as_ref() {
+- let server_path = sysroot
+- .root()
+- .join("libexec")
+- .join(&standalone_server_name);
++ let server_path =
++ sysroot.root().join("lib").join(&standalone_server_name);
+ if std::fs::metadata(&server_path).is_ok() {
+ tracing::debug!(
+ "Sysroot proc-macro server exists at {}",
diff --git a/rust/0001-cargo-Change-libexec-dir.patch b/rust/0001-cargo-Change-libexec-dir.patch
deleted file mode 100644
index 06bc493db..000000000
--- a/rust/0001-cargo-Change-libexec-dir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 6 May 2021 20:13:31 +0200
-Subject: [PATCH] cargo: Change libexec dir
-
----
- src/cargo/ops/registry/auth.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cargo/ops/registry/auth.rs b/src/cargo/ops/registry/auth.rs
-index 648e051e6dc2..a7b24e07e552 100644
---- a/src/cargo/ops/registry/auth.rs
-+++ b/src/cargo/ops/registry/auth.rs
-@@ -224,7 +224,7 @@ fn sysroot_credential(
- .parent()
- .and_then(|p| p.parent())
- .ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?;
-- let exe = root.join("libexec").join(format!(
-+ let exe = root.join("lib").join(format!(
- "cargo-credential-{}{}",
- cred_name,
- std::env::consts::EXE_SUFFIX
diff --git a/rust/0002-compiler-Change-LLVM-targets.patch b/rust/0002-compiler-Change-LLVM-targets.patch
index 7205c2390..348e4f315 100644
--- a/rust/0002-compiler-Change-LLVM-targets.patch
+++ b/rust/0002-compiler-Change-LLVM-targets.patch
@@ -24,10 +24,10 @@ targets, as things break when this is done:
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
-index 4182a5d07118..0556c95d5b5b 100644
+index f2ee52262ade..6a813c4b8707 100644
--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
-@@ -1847,7 +1847,7 @@ pub fn parse_target_triple(
+@@ -1832,7 +1832,7 @@ pub fn parse_target_triple(
early_error(error_format, &format!("target file {path:?} does not exist"))
})
}
@@ -37,11 +37,11 @@ index 4182a5d07118..0556c95d5b5b 100644
}
}
diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
-index 0998c618f31a..91c79c7e4ff0 100644
+index 73e536a7e4d9..af48d437533c 100644
--- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
@@ -9,7 +9,7 @@ pub fn target() -> Target {
- base.stack_probes = StackProbeType::Call;
+ base.stack_probes = StackProbeType::X86;
Target {
- llvm_target: "i686-unknown-linux-gnu".into(),
@@ -50,11 +50,11 @@ index 0998c618f31a..91c79c7e4ff0 100644
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
f64:32:64-f80:32-n8:16:32-S128"
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index bd5b712c143c..a78d0c20aa5d 100644
+index 8909cf33af91..e5b5bce4c290 100644
--- a/compiler/rustc_target/src/spec/mod.rs
+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -2424,6 +2424,15 @@ pub fn from_path(path: &Path) -> Result<Self, io::Error> {
- Ok(TargetTriple::TargetPath(canonicalized_path))
+@@ -2876,6 +2876,15 @@ pub fn from_path(path: &Path) -> Result<Self, io::Error> {
+ Ok(TargetTriple::TargetJson { path_for_rustdoc: canonicalized_path, triple, contents })
}
+ /// Creates a target triple from its alias
@@ -70,10 +70,10 @@ index bd5b712c143c..a78d0c20aa5d 100644
///
/// If this target is a path, the file name (without extension) is returned.
diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
-index e525cfdde14f..2dfe25f4f238 100644
+index a91ab365b668..d605eb9ccf81 100644
--- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
-@@ -15,7 +15,7 @@ pub fn target() -> Target {
+@@ -14,7 +14,7 @@ pub fn target() -> Target {
| SanitizerSet::THREAD;
Target {
diff --git a/rust/Pkgfile b/rust/Pkgfile
index ac562d604..2b399392f 100644
--- a/rust/Pkgfile
+++ b/rust/Pkgfile
@@ -5,9 +5,9 @@
# Optional: ccache libgit2 lld polly sccache
name=rust
-version=1.65.0
-_date=2022-09-22
-_rustc=1.64.0
+version=1.66.0
+_date=2022-11-03
+_rustc=1.65.0
_cargo=$_rustc
release=1
@@ -16,21 +16,20 @@ source=(https://static.rust-lang.org/dist/${name}c-$version-src.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
0001-bootstrap-Change-libexec-dir.patch
- 0001-cargo-Change-libexec-dir.patch
0002-compiler-Change-LLVM-targets.patch)
unpack_source() {
for file in ${source[@]}; do
case ${file##*/} in
rustc-${version}-src.tar.xz)
- echo "Unpacking $(get_filename $file)";
- bsdtar -p -o -C ${SRC} -xf $(get_filename $file) ;;
- *.tar.xz)
- echo "Copying $(get_filename $file)";
- mkdir -p ${SRC}/${name}c-$version-src/build/cache/${_date} || true
- cp $(get_filename $file) ${SRC}/${name}c-$version-src/build/cache/${_date} ;;
- *)
- cp $(get_filename $file) ${SRC} ;;
+ echo "Unpacking $(get_filename $file)";
+ bsdtar -p -o -C ${SRC} -xf $(get_filename $file) ;;
+ *.tar.xz)
+ echo "Copying $(get_filename $file)";
+ mkdir -p ${SRC}/${name}c-$version-src/build/cache/${_date} || true
+ cp $(get_filename $file) ${SRC}/${name}c-$version-src/build/cache/${_date} ;;
+ *)
+ cp $(get_filename $file) ${SRC} ;;
esac
done
}
@@ -64,7 +63,6 @@ build() {
# Patch cargo so credential helpers are in /usr/lib instead of /usr/libexec
patch -p1 -i $SRC/0001-bootstrap-Change-libexec-dir.patch
- patch -p1 -d src/tools/cargo -i $SRC/0001-cargo-Change-libexec-dir.patch
# Use our *-pc-linux-gnu targets, making LTO with clang simpler
patch -p1 -i $SRC/0002-compiler-Change-LLVM-targets.patch

Generated by cgit