diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-01-21 11:16:00 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-01-21 11:16:00 +0000 |
| commit | 60ef392a2a0eedfc1093e5daf7c04030dc116b5d (patch) | |
| tree | 2176e3cf29d3c6bf4417f3d42a7f5743dfc9f233 | |
| parent | 9ab85888b329e77120c8d01d77b485915dbcde17 (diff) | |
| download | rust-60ef392a2a0eedfc1093e5daf7c04030dc116b5d.tar.gz rust-60ef392a2a0eedfc1093e5daf7c04030dc116b5d.zip | |
Rustup to rustc 1.77.0-nightly (4cb17b4e7 2024-01-20)
| -rw-r--r-- | patches/0001-rand-Allow-warnings.patch | 24 | ||||
| -rw-r--r-- | patches/stdlib-lock.toml | 4 | ||||
| -rw-r--r-- | rust-toolchain | 2 | ||||
| -rw-r--r-- | src/driver/jit.rs | 7 |
4 files changed, 30 insertions, 7 deletions
diff --git a/patches/0001-rand-Allow-warnings.patch b/patches/0001-rand-Allow-warnings.patch new file mode 100644 index 00000000000..ae46e957efa --- /dev/null +++ b/patches/0001-rand-Allow-warnings.patch @@ -0,0 +1,24 @@ +From 8330c138c91f71ad43b38c026ee14b154f34a1b8 Mon Sep 17 00:00:00 2001 +From: bjorn3 <17426603+bjorn3@users.noreply.github.com> +Date: Sun, 21 Jan 2024 11:12:19 +0000 +Subject: [PATCH] Allow warnings + +--- + rand_core/src/lib.rs | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/rand_core/src/lib.rs b/rand_core/src/lib.rs +index a5a7fb1..6c84068 100644 +--- a/rand_core/src/lib.rs ++++ b/rand_core/src/lib.rs +@@ -34,7 +34,6 @@ + )] + #![deny(missing_docs)] + #![deny(missing_debug_implementations)] +-#![doc(test(attr(allow(unused_variables), deny(warnings))))] + #![cfg_attr(doc_cfg, feature(doc_cfg))] + #![no_std] + +-- +2.34.1 + diff --git a/patches/stdlib-lock.toml b/patches/stdlib-lock.toml index 8e213f71c3f..ad63b0768d3 100644 --- a/patches/stdlib-lock.toml +++ b/patches/stdlib-lock.toml @@ -61,9 +61,9 @@ dependencies = [ [[package]] name = "compiler_builtins" -version = "0.1.104" +version = "0.1.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c3f9035afc33f4358773239573f7d121099856753e1bbd2a6a5207098fc741" +checksum = "f4ab134a739bafec76aa91ccb15d519a54e569350644a1fea6528d5a0d407e22" dependencies = [ "cc", "rustc-std-workspace-core", diff --git a/rust-toolchain b/rust-toolchain index a086c029360..5fdaa2a9310 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2023-12-31" +channel = "nightly-2024-01-21" components = ["rust-src", "rustc-dev", "llvm-tools"] diff --git a/src/driver/jit.rs b/src/driver/jit.rs index 50d9f287e74..6b2b946db02 100644 --- a/src/driver/jit.rs +++ b/src/driver/jit.rs @@ -321,10 +321,9 @@ fn dep_symbol_lookup_fn( Linkage::NotLinked | Linkage::IncludedFromDylib => {} Linkage::Static => { let name = crate_info.crate_name[&cnum]; - sess.dcx() - .struct_err(format!("Can't load static lib {}", name)) - .note("rustc_codegen_cranelift can only load dylibs in JIT mode.") - .emit(); + let mut diag = sess.dcx().struct_err(format!("Can't load static lib {}", name)); + diag.note("rustc_codegen_cranelift can only load dylibs in JIT mode."); + diag.emit(); } Linkage::Dynamic => { dylib_paths.push(src.dylib.as_ref().unwrap().0.clone()); |