Skip to content

Commit

Permalink
Unrolled build for rust-lang#133147
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#133147 - ChrisDenton:fixup, r=compiler-errors

Fixup some test directives

- A random comment had somehow been turned into an `//`@`` directive.
- More dubiously I also removed leading spaces from directives in 3 UI tests for consistency. These are the only rustc tests that use that formatting.

r? `@jieyouxu`
  • Loading branch information
rust-timer authored Nov 18, 2024
2 parents 3fb7e44 + 92ff69d commit 2921113
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tests/incremental/hygiene/load_cached_hygiene.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// This causes hygiene information to be saved to the incr cache.
// 2. One function is the foreign crate is modified. This causes the
// optimized mir for an unmodified function to be loaded from the
//@ incremental cache and written out to the crate metadata.
// incremental cache and written out to the crate metadata.
// 3. In the process of loading and writing out this function's MIR,
// we load hygiene information from the incremental cache and
// write it to our metadata.
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/symbol-names/basic.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//@ build-fail
//@ revisions: legacy v0
//@[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
//@[v0]compile-flags: -C symbol-mangling-version=v0
//@[v0]compile-flags: -C symbol-mangling-version=v0

#![feature(rustc_attrs)]

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/symbol-names/impl1.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//@ build-fail
//@ revisions: legacy v0
//@[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
//@[v0]compile-flags: -C symbol-mangling-version=v0
//@[v0]compile-flags: -C symbol-mangling-version=v0
//@[legacy]normalize-stderr-test: "h[\w]{16}E?\)" -> "<SYMBOL_HASH>)"

#![feature(auto_traits, rustc_attrs)]
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/symbol-names/issue-60925.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//@ build-fail
//@ revisions: legacy v0
//@[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
//@[v0]compile-flags: -C symbol-mangling-version=v0
//@[v0]compile-flags: -C symbol-mangling-version=v0

#![feature(rustc_attrs)]

Expand Down

0 comments on commit 2921113

Please sign in to comment.