Skip to content

Commit 2921113

Browse files
authored
Unrolled build for rust-lang#133147
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`
2 parents 3fb7e44 + 92ff69d commit 2921113

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

tests/incremental/hygiene/load_cached_hygiene.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// This causes hygiene information to be saved to the incr cache.
88
// 2. One function is the foreign crate is modified. This causes the
99
// optimized mir for an unmodified function to be loaded from the
10-
//@ incremental cache and written out to the crate metadata.
10+
// incremental cache and written out to the crate metadata.
1111
// 3. In the process of loading and writing out this function's MIR,
1212
// we load hygiene information from the incremental cache and
1313
// write it to our metadata.

tests/ui/symbol-names/basic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ build-fail
22
//@ revisions: legacy v0
33
//@[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
4-
//@[v0]compile-flags: -C symbol-mangling-version=v0
4+
//@[v0]compile-flags: -C symbol-mangling-version=v0
55

66
#![feature(rustc_attrs)]
77

tests/ui/symbol-names/impl1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ build-fail
22
//@ revisions: legacy v0
33
//@[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
4-
//@[v0]compile-flags: -C symbol-mangling-version=v0
4+
//@[v0]compile-flags: -C symbol-mangling-version=v0
55
//@[legacy]normalize-stderr-test: "h[\w]{16}E?\)" -> "<SYMBOL_HASH>)"
66

77
#![feature(auto_traits, rustc_attrs)]

tests/ui/symbol-names/issue-60925.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ build-fail
22
//@ revisions: legacy v0
33
//@[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
4-
//@[v0]compile-flags: -C symbol-mangling-version=v0
4+
//@[v0]compile-flags: -C symbol-mangling-version=v0
55

66
#![feature(rustc_attrs)]
77

0 commit comments

Comments
 (0)