1
0
forked from ports/opt

rust: 1.66.1 -> 1.67.0

This commit is contained in:
Tim Biermann 2023-01-26 21:34:57 +01:00
parent 3863e7e5d3
commit 46267da23d
Signed by untrusted user: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 40 additions and 73 deletions

View File

@ -114,8 +114,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/vec_
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/vec_deque/iter_mut.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/vec_deque/macros.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/vec_deque/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/vec_deque/pair_slices.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/vec_deque/ring_slices.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/vec_deque/spec_extend.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/alloc/src/collections/vec_deque/tests.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/alloc/src/ffi/
@ -323,6 +321,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/alloc/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/alloc/layout.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/alloc/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/any.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/arch.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/array/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/array/equality.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/array/iter.rs
@ -392,6 +391,8 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/hash/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/hint.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/internal_macros.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/intrinsics.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/intrinsics/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/intrinsics/mir.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/iter/
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/array_chunks.rs
@ -429,6 +430,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/iter/sources/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/sources/once.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/sources/once_with.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/sources/repeat.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/sources/repeat_n.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/sources/repeat_with.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/iter/sources/successors.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/iter/traits/
@ -1037,9 +1039,12 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/macos/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/macos/raw.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/mod.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/net/
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/net/linux_ext/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/net/linux_ext/addr.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/net/linux_ext/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/net/linux_ext/tcp.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/net/linux_ext/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/net/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/net/tcp.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/net/tests.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/os/netbsd/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/netbsd/fs.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/os/netbsd/mod.rs
@ -1153,20 +1158,19 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sync/condvar/
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sync/lazy_lock/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/lazy_lock/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mod.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/array.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/context.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/counter.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/error.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/list.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/select.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/utils.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/waker.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpmc/zero.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/blocking.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/cache_aligned.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/mod.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/mpsc_queue.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/mpsc_queue/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/mpsc_queue/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/oneshot.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/shared.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/spsc_queue.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/spsc_queue/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/spsc_queue/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/stream.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/sync.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/sync_tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mpsc/tests.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sync/mutex.rs
@ -1424,7 +1428,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/stack_overflow.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/stack_overflow_uwp.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/stdio.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/stdio_uwp.rs
-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
@ -1434,9 +1437,6 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/windows/thread
-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/backtrace.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/condvar.rs
drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/condvar/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/condvar/check.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/fs.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/io.rs
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/lazy_box.rs
@ -1444,7 +1444,6 @@ 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/memchr/
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/memchr/tests.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/mutex.rs
-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
@ -1456,7 +1455,6 @@ 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/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/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
-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_info.rs
@ -1469,6 +1467,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/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/wstr.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

View File

@ -1,10 +1,10 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/bLJiAhGgqS5Re45o5mIhWCZhJpXH6O+JQzTHgr5ub6UhziN5VYDCv3KBNmzXJqkgmNSpmTV6JglUbG2IgPCZQQ=
SHA256 (Pkgfile) = 868541e298536465433bafa78d8ba28b868f9a2818da83a52732de351786b61c
SHA256 (.footprint) = 0da950d003add19e4655ab1302d77a283e38fc0d6460a82b31bcc98d05040f67
SHA256 (rustc-1.66.1-src.tar.xz) = 07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe
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
RWSE3ohX2g5d/QyKyIsfAQl9ub8bBsl78ZHMdteFr517uQpRwAGGt6cyIIsHX2ESanzZVwAzwMzSXIl2P6xeegHnzvGCUZM5FQQ=
SHA256 (Pkgfile) = db7c25a730a7f0bd677b9be9c512e78077999f2633d3294fb20505e6f3eed089
SHA256 (.footprint) = 4fb2f872c27f431af5b049f6ea05f4e724491995ba323dd25730d68bc387fa7c
SHA256 (rustc-1.67.0-src.tar.xz) = 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d
SHA256 (rust-std-1.66.1-x86_64-unknown-linux-gnu.tar.xz) = c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377
SHA256 (rustc-1.66.1-x86_64-unknown-linux-gnu.tar.xz) = 242855e2626860aede6957dc56481cc02acf8cad12fa5bbbcbd93f9c51f0b3ad
SHA256 (cargo-1.66.1-x86_64-unknown-linux-gnu.tar.xz) = a636f83eb2327a66f484b9592ab305c6642df16fc80d0d1cb727e766a60da904
SHA256 (0001-bootstrap-Change-libexec-dir.patch) = 6a4e09671cd96a854cf0fc9a1f43651ac5a0fdc8dca571730131ae272b630cfe
SHA256 (0002-compiler-Change-LLVM-targets.patch) = 4a4ff5c294acc0b1ca800856218770f6330a878acee72193aa456d82846a8a28

View File

@ -4,17 +4,15 @@ Date: Thu, 6 May 2021 20:14:58 +0200
Subject: [PATCH] bootstrap: Change libexec dir
---
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(-)
src/bootstrap/dist.rs | 4 ++--
src/bootstrap/tool.rs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 12585e80e6b7..eb596be98dca 100644
index 3cb0eccd324d..c4a76921fd06 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -394,7 +394,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
@@ -403,7 +403,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
target: compiler.host,
})
.expect("rust-analyzer-proc-macro-server always builds");
@ -23,7 +21,7 @@ index 12585e80e6b7..eb596be98dca 100644
let libdir_relative = builder.libdir_relative(compiler);
@@ -1003,7 +1003,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
@@ -1046,7 +1046,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-") {
@ -33,10 +31,10 @@ index 12585e80e6b7..eb596be98dca 100644
}
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index eec74b2675a1..4bf1d7348e43 100644
index e0be4c432f16..410e787616dd 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -781,7 +781,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
@@ -783,7 +783,7 @@ fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
// Copy `rust-analyzer-proc-macro-srv` to `<sysroot>/libexec/`
// so that r-a can use it.
@ -45,33 +43,3 @@ index eec74b2675a1..4bf1d7348e43 100644
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 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
@@ -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 {}",

View File

@ -5,9 +5,9 @@
# Optional: ccache libgit2 lld polly sccache
name=rust
version=1.66.1
_date=2022-11-03
_rustc=1.65.0
version=1.67.0
_date=2023-01-10
_rustc=1.66.1
_cargo=$_rustc
release=1