Fix windows test that has different stderr output

estebank · estebank · commit 4483ac2206dd · 2023-10-06T15:51:04.000Z
diff --git a/tests/ui/inference/issue-71584.rs b/tests/ui/inference/issue-71584.rs
@@ -1,3 +1,4 @@
+// ignore-windows different list of satisfying impls
 fn main() {
     let n: u32 = 1;
     let mut d: u64 = 2;
diff --git a/tests/ui/inference/issue-71584.stderr b/tests/ui/inference/issue-71584.stderr
@@ -1,5 +1,5 @@
 error[E0284]: type annotations needed
-  --> $DIR/issue-71584.rs:4:15
+  --> $DIR/issue-71584.rs:5:15
    |
 LL |     d = d % n.into();
    |           -   ^^^^
diff --git a/tests/ui/traits/issue-77982.rs b/tests/ui/traits/issue-77982.rs
@@ -1,3 +1,4 @@
+// ignore-windows different list of satisfying impls
 use std::collections::HashMap;
 
 fn what() {
diff --git a/tests/ui/traits/issue-77982.stderr b/tests/ui/traits/issue-77982.stderr
@@ -1,5 +1,5 @@
 error[E0283]: type annotations needed
-  --> $DIR/issue-77982.rs:8:10
+  --> $DIR/issue-77982.rs:9:10
    |
 LL |     opts.get(opt.as_ref());
    |          ^^^ ------------ type must be known at this point
@@ -18,7 +18,7 @@ LL |     opts.get::<Q>(opt.as_ref());
    |             +++++
 
 error[E0283]: type annotations needed
-  --> $DIR/issue-77982.rs:8:10
+  --> $DIR/issue-77982.rs:9:10
    |
 LL |     opts.get(opt.as_ref());
    |          ^^^     ------ type must be known at this point
@@ -36,7 +36,7 @@ LL |     opts.get::<Q>(opt.as_ref());
    |             +++++
 
 error[E0283]: type annotations needed
-  --> $DIR/issue-77982.rs:13:59
+  --> $DIR/issue-77982.rs:14:59
    |
 LL |     let ips: Vec<_> = (0..100_000).map(|_| u32::from(0u32.into())).collect();
    |                                            ---            ^^^^
@@ -56,13 +56,13 @@ LL |     let ips: Vec<_> = (0..100_000).map(|_| u32::from(<u32 as Into<T>>::into
    |                                                      +++++++++++++++++++++++    ~
 
 error[E0283]: type annotations needed for `Box<T>`
-  --> $DIR/issue-77982.rs:36:9
+  --> $DIR/issue-77982.rs:37:9
    |
 LL |     let _ = ().foo();
    |         ^      --- type must be known at this point
    |
 note: multiple `impl`s satisfying `(): Foo<'_, _>` found
-  --> $DIR/issue-77982.rs:29:1
+  --> $DIR/issue-77982.rs:30:1
    |
 LL | impl Foo<'static, u32> for () {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -74,13 +74,13 @@ LL |     let _: Box<T> = ().foo();
    |          ++++++++
 
 error[E0283]: type annotations needed for `Box<T>`
-  --> $DIR/issue-77982.rs:40:9
+  --> $DIR/issue-77982.rs:41:9
    |
 LL |     let _ = (&()).bar();
    |         ^         --- type must be known at this point
    |
 note: multiple `impl`s satisfying `&(): Bar<'_, _>` found
-  --> $DIR/issue-77982.rs:32:1
+  --> $DIR/issue-77982.rs:33:1
    |
 LL | impl<'a> Bar<'static, u32> for &'a () {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// ignore-windows different list of satisfying impls`
`1`	`2`	`fn main() {`
`2`	`3`	`let n: u32 = 1;`
`3`	`4`	`let mut d: u64 = 2;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error[E0284]: type annotations needed`
`2`		`- --> $DIR/issue-71584.rs:4:15`
	`2`	`+ --> $DIR/issue-71584.rs:5:15`
`3`	`3`	`\|`
`4`	`4`	`LL \| d = d % n.into();`
`5`	`5`	`\| - ^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// ignore-windows different list of satisfying impls`
`1`	`2`	`use std::collections::HashMap;`
`2`	`3`
`3`	`4`	`fn what() {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error[E0283]: type annotations needed`
`2`		`- --> $DIR/issue-77982.rs:8:10`
	`2`	`+ --> $DIR/issue-77982.rs:9:10`
`3`	`3`	`\|`
`4`	`4`	`LL \| opts.get(opt.as_ref());`
`5`	`5`	`\| ^^^ ------------ type must be known at this point`
`@@ -18,7 +18,7 @@ LL \| opts.get::<Q>(opt.as_ref());`
`18`	`18`	`\| +++++`
`19`	`19`
`20`	`20`	`error[E0283]: type annotations needed`
`21`		`- --> $DIR/issue-77982.rs:8:10`
	`21`	`+ --> $DIR/issue-77982.rs:9:10`
`22`	`22`	`\|`
`23`	`23`	`LL \| opts.get(opt.as_ref());`
`24`	`24`	`\| ^^^ ------ type must be known at this point`
`@@ -36,7 +36,7 @@ LL \| opts.get::<Q>(opt.as_ref());`
`36`	`36`	`\| +++++`
`37`	`37`
`38`	`38`	`error[E0283]: type annotations needed`
`39`		`- --> $DIR/issue-77982.rs:13:59`
	`39`	`+ --> $DIR/issue-77982.rs:14:59`
`40`	`40`	`\|`
`41`	`41`	`LL \| let ips: Vec<_> = (0..100_000).map(\|_\| u32::from(0u32.into())).collect();`
`42`	`42`	`\| --- ^^^^`
`@@ -56,13 +56,13 @@ LL \| let ips: Vec<_> = (0..100_000).map(\|_\| u32::from(<u32 as Into<T>>::into`
`56`	`56`	`\| +++++++++++++++++++++++ ~`
`57`	`57`
`58`	`58`	error[E0283]: type annotations needed for `Box<T>`
`59`		`- --> $DIR/issue-77982.rs:36:9`
	`59`	`+ --> $DIR/issue-77982.rs:37:9`
`60`	`60`	`\|`
`61`	`61`	`LL \| let _ = ().foo();`
`62`	`62`	`\| ^ --- type must be known at this point`
`63`	`63`	`\|`
`64`	`64`	note: multiple `impl`s satisfying `(): Foo<'_, _>` found
`65`		`- --> $DIR/issue-77982.rs:29:1`
	`65`	`+ --> $DIR/issue-77982.rs:30:1`
`66`	`66`	`\|`
`67`	`67`	`LL \| impl Foo<'static, u32> for () {}`
`68`	`68`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`@@ -74,13 +74,13 @@ LL \| let _: Box<T> = ().foo();`
`74`	`74`	`\| ++++++++`
`75`	`75`
`76`	`76`	error[E0283]: type annotations needed for `Box<T>`
`77`		`- --> $DIR/issue-77982.rs:40:9`
	`77`	`+ --> $DIR/issue-77982.rs:41:9`
`78`	`78`	`\|`
`79`	`79`	`LL \| let _ = (&()).bar();`
`80`	`80`	`\| ^ --- type must be known at this point`
`81`	`81`	`\|`
`82`	`82`	note: multiple `impl`s satisfying `&(): Bar<'_, _>` found
`83`		`- --> $DIR/issue-77982.rs:32:1`
	`83`	`+ --> $DIR/issue-77982.rs:33:1`
`84`	`84`	`\|`
`85`	`85`	`LL \| impl<'a> Bar<'static, u32> for &'a () {}`
`86`	`86`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`