Skip to content

Commit e12d63c

Browse files
committed
Fix
1 parent deb841a commit e12d63c

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

tests/ui/abi/abi-sysv64-arg-passing.rs

+1
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ fn main() {
424424
extern_pass_u32();
425425
extern_pass_u64();
426426
extern_pass_double();
427+
#[cfg(not(target_env = "msvc"))]
427428
extern_pass_empty();
428429
extern_pass_twou8s();
429430
extern_pass_twou16s();

tests/ui/linkage-attr/linkage-attr-does-not-panic-llvm-issue-33992.rs

+2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ pub static TEST2: bool = true;
1010
#[linkage = "internal"]
1111
pub static TEST3: bool = true;
1212

13+
#[cfg(not(target_env = "msvc"))]
1314
#[linkage = "linkonce"]
1415
pub static TEST4: bool = true;
1516

17+
#[cfg(not(target_env = "msvc"))]
1618
#[linkage = "linkonce_odr"]
1719
pub static TEST5: bool = true;
1820

tests/ui/traits/issue-77982.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
//@ ignore-arm different list of satisfying impls
2+
//@ ignore-windows: Windows gets an extra E0283, unclear why
23
use std::collections::HashMap;
34

45
fn what() {

tests/ui/traits/issue-77982.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0283]: type annotations needed
2-
--> $DIR/issue-77982.rs:9:10
2+
--> $DIR/issue-77982.rs:10:10
33
|
44
LL | opts.get(opt.as_ref());
55
| ^^^ ------------ type must be known at this point
@@ -18,7 +18,7 @@ LL | opts.get::<Q>(opt.as_ref());
1818
| +++++
1919

2020
error[E0283]: type annotations needed
21-
--> $DIR/issue-77982.rs:9:10
21+
--> $DIR/issue-77982.rs:10:10
2222
|
2323
LL | opts.get(opt.as_ref());
2424
| ^^^ ------ type must be known at this point
@@ -36,7 +36,7 @@ LL | opts.get::<Q>(opt.as_ref());
3636
| +++++
3737

3838
error[E0283]: type annotations needed
39-
--> $DIR/issue-77982.rs:14:59
39+
--> $DIR/issue-77982.rs:15:59
4040
|
4141
LL | let ips: Vec<_> = (0..100_000).map(|_| u32::from(0u32.into())).collect();
4242
| --- ^^^^
@@ -56,13 +56,13 @@ LL | let ips: Vec<_> = (0..100_000).map(|_| u32::from(<u32 as Into<T>>::into
5656
| +++++++++++++++++++++++ ~
5757

5858
error[E0283]: type annotations needed for `Box<_>`
59-
--> $DIR/issue-77982.rs:37:9
59+
--> $DIR/issue-77982.rs:38:9
6060
|
6161
LL | let _ = ().foo();
6262
| ^ --- type must be known at this point
6363
|
6464
note: multiple `impl`s satisfying `(): Foo<'_, _>` found
65-
--> $DIR/issue-77982.rs:30:1
65+
--> $DIR/issue-77982.rs:31:1
6666
|
6767
LL | impl Foo<'static, u32> for () {}
6868
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -74,13 +74,13 @@ LL | let _: Box<T> = ().foo();
7474
| ++++++++
7575

7676
error[E0283]: type annotations needed for `Box<_>`
77-
--> $DIR/issue-77982.rs:41:9
77+
--> $DIR/issue-77982.rs:42:9
7878
|
7979
LL | let _ = (&()).bar();
8080
| ^ --- type must be known at this point
8181
|
8282
note: multiple `impl`s satisfying `&(): Bar<'_, _>` found
83-
--> $DIR/issue-77982.rs:33:1
83+
--> $DIR/issue-77982.rs:34:1
8484
|
8585
LL | impl<'a> Bar<'static, u32> for &'a () {}
8686
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)