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

rustc_codegen_spirv/test: unbreak after termcolor-related changes.

Browse Source
This commit is contained in:
Eduard-Mihai Burtescu 2023-11-21 17:30:11 +02:00
parent 8858d5f7aa
commit 9d9e7c9eb4
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -2041,7 +2041,6 @@ dependencies = [
"spirv-tools", "spirv-tools",
"syn", "syn",
"tempfile", "tempfile",
"termcolor",
] ]
[[package]] [[package]]

7
crates/rustc_codegen_spirv/Cargo.toml
View File

@ -62,13 +62,6 @@ spirt = "0.3.0"
lazy_static = "1.4.0" lazy_static = "1.4.0"
itertools = "0.10.5" itertools = "0.10.5"
# `termcolor` is needed because we cannot construct an Emitter after it was added in
# https://github.com/rust-lang/rust/pull/114104. This can be removed when
# https://github.com/rust-lang/rust/pull/115393 lands.
# We need to construct an emitter as yet another workaround,
# see https://github.com/rust-lang/rust/pull/102992.
termcolor = "1.2"
[dev-dependencies] [dev-dependencies]
pipe = "0.4" pipe = "0.4"
pretty_assertions = "1.0" pretty_assertions = "1.0"

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

@ -6,6 +6,13 @@ use rustc_session::CompilerIO;
use rustc_span::FileName; use rustc_span::FileName;
use std::io::Write; use std::io::Write;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
// `termcolor` is needed because we cannot construct an Emitter after it was added in
// https://github.com/rust-lang/rust/pull/114104. This can be removed when
// https://github.com/rust-lang/rust/pull/115393 lands.
// We need to construct an emitter as yet another workaround,
// see https://github.com/rust-lang/rust/pull/102992.
extern crate termcolor;
use termcolor::{ColorSpec, WriteColor}; use termcolor::{ColorSpec, WriteColor};
// https://github.com/colin-kiegel/rust-pretty-assertions/issues/24 // https://github.com/colin-kiegel/rust-pretty-assertions/issues/24
@ -81,9 +88,8 @@ fn link_with_linker_opts(
struct BufWriter(Arc<Mutex<Vec<u8>>>); struct BufWriter(Arc<Mutex<Vec<u8>>>);
impl BufWriter { impl BufWriter {
fn to_string(self) -> String { fn unwrap_to_string(self) -> String {
let x = self.0.into_inner().expect("diagnostics unlocked"); String::from_utf8(Arc::try_unwrap(self.0).ok().unwrap().into_inner().unwrap()).unwrap()
String::from_utf8(x).expect("conversion to string")
} }
} }
@ -190,7 +196,13 @@ fn link_with_linker_opts(
}) })
}) })
.flatten() .flatten()
.map_err(|_e| buf.to_string()) .map_err(|_e| {
let mut diags = output.unwrap_to_string();
if let Some(diags_without_trailing_newlines) = diags.strip_suffix("\n\n") {
diags.truncate(diags_without_trailing_newlines.len());
}
diags
})
.map_err(PrettyString) .map_err(PrettyString)
} }