use different revisions for testing colors on windows

this is kinda jank because it means people need both machines to bless the tests
This commit is contained in:
jyn 2023-12-09 08:40:55 -05:00
parent 96b027f35d
commit 32e48fc36b
6 changed files with 81 additions and 6 deletions

View File

@ -1,5 +1,5 @@
error[E0308]: mismatched types error[E0308]: mismatched types
 --> $DIR/highlighting.rs:22:11  --> $DIR/highlighting.rs:26:11
 |  |
LL |  query(wrapped_fn); LL |  query(wrapped_fn);
 |  ----- ^^^^^^^^^^ one type is more general than the other  |  ----- ^^^^^^^^^^ one type is more general than the other
@ -9,7 +9,7 @@
 = note: expected fn pointer `for<'a> fn(Box<(dyn Any + Send + 'a)>) -> Pin<_>`  = note: expected fn pointer `for<'a> fn(Box<(dyn Any + Send + 'a)>) -> Pin<_>`
 found fn item `fn(Box<(dyn Any + Send + 'static)>) -> Pin<_> {wrapped_fn}`  found fn item `fn(Box<(dyn Any + Send + 'static)>) -> Pin<_> {wrapped_fn}`
note: function defined here note: function defined here
 --> $DIR/highlighting.rs:11:4  --> $DIR/highlighting.rs:15:4
 |  |
LL | fn query(_: fn(Box<(dyn Any + Send + '_)>) -> Pin<Box<( LL | fn query(_: fn(Box<(dyn Any + Send + '_)>) -> Pin<Box<(
 |  ____^^^^^_-  |  ____^^^^^_-

View File

@ -4,6 +4,10 @@
// error-pattern:for<'a>  // error-pattern:for<'a> 
// edition:2018 // edition:2018
// revisions: windows not-windows
// [windows]only-windows
// [not-windows]ignore-windows
use core::pin::Pin; use core::pin::Pin;
use core::future::Future; use core::future::Future;
use core::any::Any; use core::any::Any;

View File

@ -0,0 +1,22 @@
error[E0308]: mismatched types
 --> $DIR/highlighting.rs:26:11
 |
LL |  query(wrapped_fn);
 |  ----- ^^^^^^^^^^ one type is more general than the other
 |  |
 |  arguments to this function are incorrect
 |
 = note: expected fn pointer `for<'a> fn(Box<(dyn Any + Send + 'a)>) -> Pin<_>`
 found fn item `fn(Box<(dyn Any + Send + 'static)>) -> Pin<_> {wrapped_fn}`
note: function defined here
 --> $DIR/highlighting.rs:15:4
 |
LL | fn query(_: fn(Box<(dyn Any + Send + '_)>) -> Pin<Box<(
 |  ____^^^^^_-
LL | |  dyn Future<Output = Result<Box<(dyn Any + 'static)>, String>> + Send + 'static
LL | | )>>) {}
 | |___-
error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0308`.

View File

@ -1,5 +1,5 @@
error[E0106]: missing lifetime specifier error[E0106]: missing lifetime specifier
 --> $DIR/multiline-multipart-suggestion.rs:5:34  --> $DIR/multiline-multipart-suggestion.rs:8:34
 |  |
LL | fn short(foo_bar: &Vec<&i32>) -> &i32 { LL | fn short(foo_bar: &Vec<&i32>) -> &i32 {
 |  ---------- ^ expected named lifetime parameter  |  ---------- ^ expected named lifetime parameter
@ -11,7 +11,7 @@
 | ++++ ++ ++ ++  | ++++ ++ ++ ++
error[E0106]: missing lifetime specifier error[E0106]: missing lifetime specifier
 --> $DIR/multiline-multipart-suggestion.rs:12:6  --> $DIR/multiline-multipart-suggestion.rs:15:6
 |  |
LL |  foo_bar: &Vec<&i32>, LL |  foo_bar: &Vec<&i32>,
 |  ----------  |  ----------
@ -29,7 +29,7 @@
 |  |
error[E0106]: missing lifetime specifier error[E0106]: missing lifetime specifier
 --> $DIR/multiline-multipart-suggestion.rs:17:29  --> $DIR/multiline-multipart-suggestion.rs:20:29
 |  |
LL |  foo_bar: &Vec<&i32>) -> &i32 { LL |  foo_bar: &Vec<&i32>) -> &i32 {
 |  ---------- ^ expected named lifetime parameter  |  ---------- ^ expected named lifetime parameter

View File

@ -1,6 +1,9 @@
// compile-flags: --error-format=human --color=always // compile-flags: --error-format=human --color=always
// error-pattern: missing lifetime specifier // error-pattern: missing lifetime specifier
// ignore-windows
// revisions: windows not-windows
// [windows]only-windows
// [not-windows]ignore-windows
fn short(foo_bar: &Vec<&i32>) -> &i32 { fn short(foo_bar: &Vec<&i32>) -> &i32 {
&12 &12

View File

@ -0,0 +1,46 @@
error[E0106]: missing lifetime specifier
 --> $DIR/multiline-multipart-suggestion.rs:8:34
 |
LL | fn short(foo_bar: &Vec<&i32>) -> &i32 {
 |  ---------- ^ expected named lifetime parameter
 |
 = help: this function's return type contains a borrowed value, but the signature does not say which one of `foo_bar`'s 2 lifetimes it is borrowed from
help: consider introducing a named lifetime parameter
 |
LL | fn short<'a>(foo_bar: &'a Vec<&'a i32>) -> &'a i32 {
 | ++++ ++ ++ ++
error[E0106]: missing lifetime specifier
 --> $DIR/multiline-multipart-suggestion.rs:15:6
 |
LL |  foo_bar: &Vec<&i32>,
 |  ----------
LL |  something_very_long_so_that_the_line_will_wrap_around__________: i32,
LL | ) -> &i32 {
 |  ^ expected named lifetime parameter
 |
 = help: this function's return type contains a borrowed value, but the signature does not say which one of `foo_bar`'s 2 lifetimes it is borrowed from
help: consider introducing a named lifetime parameter
 |
LL ~ fn long<'a>(
LL ~  foo_bar: &'a Vec<&'a i32>,
LL |  something_very_long_so_that_the_line_will_wrap_around__________: i32,
LL ~ ) -> &'a i32 {
 |
error[E0106]: missing lifetime specifier
 --> $DIR/multiline-multipart-suggestion.rs:20:29
 |
LL |  foo_bar: &Vec<&i32>) -> &i32 {
 |  ---------- ^ expected named lifetime parameter
 |
 = help: this function's return type contains a borrowed value, but the signature does not say which one of `foo_bar`'s 2 lifetimes it is borrowed from
help: consider introducing a named lifetime parameter
 |
LL ~ fn long2<'a>(
LL ~  foo_bar: &'a Vec<&'a i32>) -> &'a i32 {
 |
error: aborting due to 3 previous errors
For more information about this error, try `rustc --explain E0106`.