diff --git a/crates/rustc_codegen_spirv/build.rs b/crates/rustc_codegen_spirv/build.rs index 50956f82da..3421809057 100644 --- a/crates/rustc_codegen_spirv/build.rs +++ b/crates/rustc_codegen_spirv/build.rs @@ -10,9 +10,9 @@ use std::process::{Command, ExitCode}; /// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/ //const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain"); const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain] -channel = "nightly-2023-02-01" +channel = "nightly-2023-02-15" components = ["rust-src", "rustc-dev", "llvm-tools-preview"] -# commit_hash = dc1d9d50fba2f6a1ccab8748a0050cde38253f60"#; +# commit_hash = 0416b1a6f6d5c42696494e1a3a33580fd3f669d8"#; fn get_rustc_commit_hash() -> Result> { let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc")); diff --git a/crates/rustc_codegen_spirv/src/linker/test.rs b/crates/rustc_codegen_spirv/src/linker/test.rs index a8bd254726..70d4fc8229 100644 --- a/crates/rustc_codegen_spirv/src/linker/test.rs +++ b/crates/rustc_codegen_spirv/src/linker/test.rs @@ -1,7 +1,7 @@ use super::{link, LinkResult}; use pipe::pipe; use rspirv::dr::{Loader, Module}; -use rustc_errors::registry::Registry; +use rustc_errors::{registry::Registry, TerminalUrl}; use rustc_session::{config::Input, CompilerIO}; use rustc_span::FileName; use std::io::Read; @@ -169,6 +169,7 @@ fn link_with_linker_opts( None, false, false, + TerminalUrl::No, ); rustc_errors::Handler::with_emitter_and_flags( diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c0540c69a2..e2f5169fd8 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,7 +1,7 @@ [toolchain] -channel = "nightly-2023-02-01" +channel = "nightly-2023-02-15" components = ["rust-src", "rustc-dev", "llvm-tools-preview"] -# commit_hash = dc1d9d50fba2f6a1ccab8748a0050cde38253f60 +# commit_hash = 0416b1a6f6d5c42696494e1a3a33580fd3f669d8 # Whenever changing the nightly channel, update the commit hash above, and make # sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also. diff --git a/tests/ui/arch/debug_printf_type_checking.stderr b/tests/ui/arch/debug_printf_type_checking.stderr index 58cbef183f..228b6ad358 100644 --- a/tests/ui/arch/debug_printf_type_checking.stderr +++ b/tests/ui/arch/debug_printf_type_checking.stderr @@ -143,7 +143,7 @@ error[E0308]: mismatched types 24 | debug_printf!("%f", Vec2::splat(33.3)); | --------------------^^^^^^^^^^^^^^^^^- | | | - | | expected `f32`, found struct `Vec2` + | | expected `f32`, found `Vec2` | arguments to this function are incorrect | help: the return type of this call is `Vec2` due to the type of the argument passed diff --git a/tests/ui/dis/ptr_copy.normal.stderr b/tests/ui/dis/ptr_copy.normal.stderr index 40eb74cbe5..26f874bdef 100644 --- a/tests/ui/dis/ptr_copy.normal.stderr +++ b/tests/ui/dis/ptr_copy.normal.stderr @@ -1,7 +1,7 @@ error: Cannot memcpy dynamically sized data - --> $CORE_SRC/intrinsics.rs:2458:9 + --> $CORE_SRC/intrinsics.rs:2456:9 | -2458 | copy(src, dst, count) +2456 | copy(src, dst, count) | ^^^^^^^^^^^^^^^^^^^^^ | = note: Stack: