Skip to content

Commit 4a83f43

Browse files
authored
Rollup merge of #139904 - ferrocene:lw-wkumpwrytvtp, r=nnethercote,jieyouxu
Explicitly annotate edition for `unpretty=expanded` and `unpretty=hir` tests These emit prelude imports which means they are always edition dependent and so running them with a different `--edition` will fail.
2 parents 4e2fc09 + 20ab952 commit 4a83f43

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+53
-7
lines changed

diff

Whitespace-only changes.

tests/ui/asm/unpretty-expanded.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ needs-asm-support
22
//@ check-pass
33
//@ compile-flags: -Zunpretty=expanded
4+
//@ edition: 2015
45
core::arch::global_asm!("x: .byte 42");

tests/ui/asm/unpretty-expanded.stdout

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ extern crate std;
77
//@ needs-asm-support
88
//@ check-pass
99
//@ compile-flags: -Zunpretty=expanded
10+
//@ edition: 2015
1011
global_asm! ("x: .byte 42");

tests/ui/codemap_tests/unicode.expanded.stdout

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ extern crate std;
77
//@ revisions: normal expanded
88
//@[expanded] check-pass
99
//@[expanded]compile-flags: -Zunpretty=expanded
10+
//@ edition: 2015
1011

1112
extern "路濫狼á́́" fn foo() {}
1213

tests/ui/codemap_tests/unicode.normal.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0703]: invalid ABI: found `路濫狼á́́`
2-
--> $DIR/unicode.rs:5:8
2+
--> $DIR/unicode.rs:6:8
33
|
44
LL | extern "路濫狼á́́" fn foo() {}
55
| ^^^^^^^^^ invalid ABI

tests/ui/codemap_tests/unicode.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ revisions: normal expanded
22
//@[expanded] check-pass
33
//@[expanded]compile-flags: -Zunpretty=expanded
4+
//@ edition: 2015
45

56
extern "路濫狼á́́" fn foo() {} //[normal]~ ERROR invalid ABI
67

tests/ui/const-generics/defaults/pretty-printing-ast.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Test the AST pretty printer correctly handles default values for const generics
22
//@ check-pass
33
//@ compile-flags: -Z unpretty=expanded
4+
//@ edition: 2015
45

56
#![crate_type = "lib"]
67

tests/ui/const-generics/defaults/pretty-printing-ast.stdout

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// Test the AST pretty printer correctly handles default values for const generics
44
//@ check-pass
55
//@ compile-flags: -Z unpretty=expanded
6+
//@ edition: 2015
67

78
#![crate_type = "lib"]
89
#[prelude_import]

tests/ui/deriving/built-in-proc-macro-scope.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//@ check-pass
22
//@ proc-macro: another-proc-macro.rs
33
//@ compile-flags: -Zunpretty=expanded
4+
//@ edition:2015
45

56
#![feature(derive_coerce_pointee)]
67

tests/ui/deriving/built-in-proc-macro-scope.stdout

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
//@ check-pass
44
//@ proc-macro: another-proc-macro.rs
55
//@ compile-flags: -Zunpretty=expanded
6+
//@ edition:2015
67

78
#![feature(derive_coerce_pointee)]
89
#[prelude_import]

0 commit comments

Comments
 (0)