Skip to content

Commit 0822230

Browse files
jieyouxujieyouxu
committed
Fix two UI tests with incorrect directive / invalid revision
1 parent bdc1592 commit 0822230

5 files changed

+33
-18
lines changed

‎tests/ui/asm/inline-syntax.arm.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LL | .intel_syntax noprefix
1313
| ^
1414

1515
error: unknown directive
16-
--> $DIR/inline-syntax.rs:38:15
16+
--> $DIR/inline-syntax.rs:35:15
1717
|
1818
LL | asm!(".intel_syntax noprefix", "nop");
1919
| ^
@@ -25,7 +25,7 @@ LL | .intel_syntax noprefix
2525
| ^
2626

2727
error: unknown directive
28-
--> $DIR/inline-syntax.rs:42:15
28+
--> $DIR/inline-syntax.rs:39:15
2929
|
3030
LL | asm!(".intel_syntax aaa noprefix", "nop");
3131
| ^
@@ -37,7 +37,7 @@ LL | .intel_syntax aaa noprefix
3737
| ^
3838

3939
error: unknown directive
40-
--> $DIR/inline-syntax.rs:46:15
40+
--> $DIR/inline-syntax.rs:43:15
4141
|
4242
LL | asm!(".att_syntax noprefix", "nop");
4343
| ^
@@ -49,7 +49,7 @@ LL | .att_syntax noprefix
4949
| ^
5050

5151
error: unknown directive
52-
--> $DIR/inline-syntax.rs:50:15
52+
--> $DIR/inline-syntax.rs:47:15
5353
|
5454
LL | asm!(".att_syntax bbb noprefix", "nop");
5555
| ^
@@ -61,7 +61,7 @@ LL | .att_syntax bbb noprefix
6161
| ^
6262

6363
error: unknown directive
64-
--> $DIR/inline-syntax.rs:54:15
64+
--> $DIR/inline-syntax.rs:51:15
6565
|
6666
LL | asm!(".intel_syntax noprefix; nop");
6767
| ^
@@ -73,7 +73,7 @@ LL | .intel_syntax noprefix; nop
7373
| ^
7474

7575
error: unknown directive
76-
--> $DIR/inline-syntax.rs:61:13
76+
--> $DIR/inline-syntax.rs:58:13
7777
|
7878
LL | .intel_syntax noprefix
7979
| ^

‎tests/ui/asm/inline-syntax.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
//[x86_64] compile-flags: --target x86_64-unknown-linux-gnu
33
//[x86_64] check-pass
44
//[x86_64] needs-llvm-components: x86
5-
//[x86_64_allowed] compile-flags: --target x86_64-unknown-linux-gnu
6-
//[x86_64_allowed] check-pass
7-
//[x86_64_allowed] needs-llvm-components: x86
85
//[arm] compile-flags: --target armv7-unknown-linux-gnueabihf
96
//[arm] build-fail
107
//[arm] needs-llvm-components: arm
118
//[arm] ignore-llvm-version: 18 - 99
12-
// Newer LLVM produces extra error notes.
9+
//Newer LLVM produces extra error notes.
1310
//[arm_llvm_18] compile-flags: --target armv7-unknown-linux-gnueabihf
1411
//[arm_llvm_18] build-fail
1512
//[arm_llvm_18] needs-llvm-components: arm

‎tests/ui/asm/inline-syntax.x86_64.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
warning: avoid using `.intel_syntax`, Intel syntax is the default
2-
--> $DIR/inline-syntax.rs:70:14
2+
--> $DIR/inline-syntax.rs:67:14
33
|
44
LL | global_asm!(".intel_syntax noprefix", "nop");
55
| ^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: `#[warn(bad_asm_style)]` on by default
88

99
warning: avoid using `.intel_syntax`, Intel syntax is the default
10-
--> $DIR/inline-syntax.rs:38:15
10+
--> $DIR/inline-syntax.rs:35:15
1111
|
1212
LL | asm!(".intel_syntax noprefix", "nop");
1313
| ^^^^^^^^^^^^^^^^^^^^^^
1414

1515
warning: avoid using `.intel_syntax`, Intel syntax is the default
16-
--> $DIR/inline-syntax.rs:42:15
16+
--> $DIR/inline-syntax.rs:39:15
1717
|
1818
LL | asm!(".intel_syntax aaa noprefix", "nop");
1919
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
2020

2121
warning: avoid using `.att_syntax`, prefer using `options(att_syntax)` instead
22-
--> $DIR/inline-syntax.rs:46:15
22+
--> $DIR/inline-syntax.rs:43:15
2323
|
2424
LL | asm!(".att_syntax noprefix", "nop");
2525
| ^^^^^^^^^^^^^^^^^^^^
2626

2727
warning: avoid using `.att_syntax`, prefer using `options(att_syntax)` instead
28-
--> $DIR/inline-syntax.rs:50:15
28+
--> $DIR/inline-syntax.rs:47:15
2929
|
3030
LL | asm!(".att_syntax bbb noprefix", "nop");
3131
| ^^^^^^^^^^^^^^^^^^^^^^^^
3232

3333
warning: avoid using `.intel_syntax`, Intel syntax is the default
34-
--> $DIR/inline-syntax.rs:54:15
34+
--> $DIR/inline-syntax.rs:51:15
3535
|
3636
LL | asm!(".intel_syntax noprefix; nop");
3737
| ^^^^^^^^^^^^^^^^^^^^^^
3838

3939
warning: avoid using `.intel_syntax`, Intel syntax is the default
40-
--> $DIR/inline-syntax.rs:61:13
40+
--> $DIR/inline-syntax.rs:58:13
4141
|
4242
LL | .intel_syntax noprefix
4343
| ^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/borrowck/copy-suggestion-region-vid.fixed

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// run-rustfix
2+
pub struct DataStruct();
3+
4+
pub struct HelperStruct<'n> {
5+
pub helpers: [Vec<&'n i64>; 2],
6+
pub is_empty: bool,
7+
}
8+
9+
impl DataStruct {
10+
pub fn f(&self) -> HelperStruct {
11+
let helpers = [vec![], vec![]];
12+
13+
HelperStruct { helpers: helpers.clone(), is_empty: helpers[0].is_empty() }
14+
//~^ ERROR borrow of moved value
15+
}
16+
}
17+
18+
fn main() {}

‎tests/ui/borrowck/copy-suggestion-region-vid.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@run-rustfix
1+
// run-rustfix
22
pub struct DataStruct();
33

44
pub struct HelperStruct<'n> {

0 commit comments

Comments
 (0)