nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-25 00:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to nightly-2023-02-15

Browse Source
This commit is contained in:
Sylvester Hesp 2023-03-17 12:47:01 +01:00
parent a239e344b6
commit 1ca358b9f6
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/rustc_codegen_spirv/build.rs
View File

@ -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<String, Box<dyn Error>> {
let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc"));

3
crates/rustc_codegen_spirv/src/linker/test.rs
View File

@ -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(

4
rust-toolchain.toml
View File

@ -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.

2
tests/ui/arch/debug_printf_type_checking.stderr
View File

@ -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

4
tests/ui/dis/ptr_copy.normal.stderr
View File

@ -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: