about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2022-01-30 16:52:18 +0100
committerbjorn3 <bjorn3@users.noreply.github.com>2022-01-30 16:52:18 +0100
commit96dc846a7d6e5827477ded238afef7c01af9e6f6 (patch)
treedb83b01362bc369aface31e70d1489352689afd4
parent2d32e51d863c4fcdaeed060fc52e8a90ae753072 (diff)
downloadrust-96dc846a7d6e5827477ded238afef7c01af9e6f6.tar.gz
rust-96dc846a7d6e5827477ded238afef7c01af9e6f6.zip
Rustup to rustc 1.60.0-nightly (a00e130da 2022-01-29)
-rw-r--r--build_sysroot/Cargo.lock12
-rw-r--r--patches/0022-sysroot-Disable-not-compiling-tests.patch2
-rw-r--r--rust-toolchain2
3 files changed, 8 insertions, 8 deletions
diff --git a/build_sysroot/Cargo.lock b/build_sysroot/Cargo.lock
index dd096562480..aa69e032fa8 100644
--- a/build_sysroot/Cargo.lock
+++ b/build_sysroot/Cargo.lock
@@ -110,9 +110,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
 dependencies = [
  "compiler_builtins",
  "rustc-std-workspace-alloc",
@@ -132,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.112"
+version = "0.2.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"
 dependencies = [
  "rustc-std-workspace-core",
 ]
@@ -319,9 +319,9 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 dependencies = [
  "compiler_builtins",
  "rustc-std-workspace-alloc",
diff --git a/patches/0022-sysroot-Disable-not-compiling-tests.patch b/patches/0022-sysroot-Disable-not-compiling-tests.patch
index ff8d5e8742b..1c45c7573c8 100644
--- a/patches/0022-sysroot-Disable-not-compiling-tests.patch
+++ b/patches/0022-sysroot-Disable-not-compiling-tests.patch
@@ -44,7 +44,7 @@ index 1a6be3a..42dbd59 100644
 --- a/library/core/tests/ptr.rs
 +++ b/library/core/tests/ptr.rs
 @@ -250,6 +250,7 @@ fn test_unsized_nonnull() {
-     assert!(ys == zs);
+     };
  }
  
 +/*
diff --git a/rust-toolchain b/rust-toolchain
index c42f8e5f455..bf316efc324 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-01-19"
+channel = "nightly-2022-01-30"
 components = ["rust-src", "rustc-dev", "llvm-tools-preview"]