Skip to content

Commit 1a5054c

Browse files
committed
Fix CI issues: rustfmt and compiletest stderr update
- Fix rustfmt formatting in codegen_cx/mod.rs - Update expected stderr for sampled_image_rect_query_size_lod_err test
1 parent 05010c1 commit 1a5054c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

crates/rustc_codegen_spirv/src/codegen_cx/mod.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,14 @@ impl CodegenArgs {
339339
pub fn from_session(sess: &Session) -> Self {
340340
// Split comma-separated arguments within each llvm_args entry
341341
// This handles cases like "--disassemble-fn=foo,--allow-fragment-no-output"
342-
let expanded_args: Vec<String> = sess.opts.cg.llvm_args
342+
let expanded_args: Vec<String> = sess
343+
.opts
344+
.cg
345+
.llvm_args
343346
.iter()
344347
.flat_map(|arg| arg.split(',').map(|s| s.to_string()))
345348
.collect();
346-
349+
347350
match CodegenArgs::parse(&expanded_args) {
348351
Ok(ok) => ok,
349352
Err(err) => sess

tests/compiletests/ui/image/query/sampled_image_rect_query_size_lod_err.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQuerySizeLod` is not satisfied
2-
--> $DIR/sampled_image_rect_query_size_lod_err.rs:21:28
2+
--> $DIR/sampled_image_rect_query_size_lod_err.rs:22:28
33
|
4-
21 | *output = rect_sampled.query_size_lod(0);
4+
22 | *output = rect_sampled.query_size_lod(0);
55
| ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
66
|
77
= help: the following other types implement trait `HasQuerySizeLod`:

0 commit comments

Comments
 (0)