Merge pull request #2532 from flatcar/rust-1.68.0-main

Upgrade dev-lang/rust and virtual/rust in main from 1.67.1 to 1.68.0
flatcar-archive · Mar 15, 2023 · 4b937aa · 4b937aa
2 parents 0229f44 + 82eda93
commit 4b937aa
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 45 deletions.
diff --git a/changelog/updates/2023-03-14-rust-1.68.0-update.md b/changelog/updates/2023-03-14-rust-1.68.0-update.md
@@ -0,0 +1 @@
+- Rust ([1.68.0](https://github.com/rust-lang/rust/releases/tag/1.68.0))
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
diff --git a/dev-lang/rust/files/1.65.0-ignore-broken-and-non-applicable-tests.patch b/dev-lang/rust/files/1.65.0-ignore-broken-and-non-applicable-tests.patch
@@ -10,31 +10,31 @@ simd-intrinsic-generic-bitmask.rs: broken on BE, #59356
 sparc-struct-abi: no sparc target
 sysroot-crates-are-unstable: can't run rustc without RPATH
 ---
- src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++
- src/test/ui/env-funky-keys.rs                                   | 1 +
+ tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++
+ tests/ui/env-funky-keys.rs                                   | 1 +
  6 files changed, 10 insertions(+)
 
-diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
+diff --git a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 index 9e770706857..6d92ec5cec8 100644
---- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
-+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
+--- a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
++++ b/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
 @@ -1,1 +1,3 @@
 +# ignore-test
 +
  all:
          python2.7 test.py
-diff --git a/src/test/ui/env-funky-keys.rs b/src/test/ui/env-funky-keys.rs
+diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs
 index c5c824ac58d..f3fe047a79c 100644
---- a/src/test/ui/env-funky-keys.rs
-+++ b/src/test/ui/env-funky-keys.rs
+--- a/tests/ui/env-funky-keys.rs
++++ b/tests/ui/env-funky-keys.rs
 @@ -1,6 +1,7 @@
  // run-pass
  // Ignore this test on Android, because it segfaults there.
 
 +// ignore-test
  // ignore-android
  // ignore-windows
- // ignore-cloudabi no execve
+ // ignore-emscripten no execve
 -- 
 2.24.1
 
diff --git a/dev-lang/rust/rust-1.67.1.ebuild → dev-lang/rust/rust-1.68.0.ebuild b/dev-lang/rust/rust-1.67.1.ebuild → dev-lang/rust/rust-1.68.0.ebuild
diff --git a/profiles/coreos/base/package.accept_keywords b/profiles/coreos/base/package.accept_keywords
@@ -14,8 +14,8 @@
 =dev-lang/python-oem-3.10.10_p2 ~arm64
 
 # Accept unstable host Rust compilers
-=dev-lang/rust-1.67.1 ~amd64 ~arm64
-=virtual/rust-1.67.1 ~amd64 ~arm64
+=dev-lang/rust-1.68.0 ~amd64 ~arm64
+=virtual/rust-1.68.0 ~amd64 ~arm64
 
 =dev-libs/libgcrypt-1.9.4 ~amd64 ~arm64
 

diff --git a/virtual/rust/rust-1.67.1.ebuild → virtual/rust/rust-1.68.0.ebuild b/virtual/rust/rust-1.67.1.ebuild → virtual/rust/rust-1.68.0.ebuild
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Rust ([1.68.0](https://github.com/rust-lang/rust/releases/tag/1.68.0))