mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix invalid compiletest directives in tests

Browse Source 
- Fix invalid directive in `normalize-hidden-types`
- Update legacy directive in `two-phase-reservation-sharing-interference`
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2024-02-24 17:04:37 +00:00
parent 5877e7e8d2
commit 64dda8c837
No known key found for this signature in database
GPG Key ID: 95DDEBD74A1DC2C0
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ui/borrowck/two-phase-reservation-sharing-interference.rs
View File

@ -2,7 +2,7 @@
// The nll_beyond revision is disabled due to missing support from two-phase beyond autorefs // The nll_beyond revision is disabled due to missing support from two-phase beyond autorefs
//@[nll_beyond]compile-flags: -Z two-phase-beyond-autoref //@[nll_beyond]compile-flags: -Z two-phase-beyond-autoref
//[nll_beyond]should-fail //@[nll_beyond]should-fail
// This is a corner case that the current implementation is (probably) // This is a corner case that the current implementation is (probably)
// treating more conservatively than is necessary. But it also does // treating more conservatively than is necessary. But it also does

12
tests/ui/type-alias-impl-trait/normalize-hidden-types.current.stderr
View File

@ -5,25 +5,25 @@ LL | fn define() -> Opaque {
| ^^^^^^ expected `*const (dyn FnOnce(()) + 'static)`, got `*const dyn for<'a> FnOnce(<u8 as Trait>::Gat<'a>)` | ^^^^^^ expected `*const (dyn FnOnce(()) + 'static)`, got `*const dyn for<'a> FnOnce(<u8 as Trait>::Gat<'a>)`
| |
note: previous use here note: previous use here
--> $DIR/normalize-hidden-types.rs:27:9 --> $DIR/normalize-hidden-types.rs:26:9
| |
LL | dyn_hoops::<_>(0) LL | dyn_hoops::<_>(0)
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
error: concrete type differs from previous defining opaque type use error: concrete type differs from previous defining opaque type use
--> $DIR/normalize-hidden-types.rs:34:22 --> $DIR/normalize-hidden-types.rs:33:22
| |
LL | fn define_1() -> Opaque { dyn_hoops::<_>(0) } LL | fn define_1() -> Opaque { dyn_hoops::<_>(0) }
| ^^^^^^ expected `*const (dyn FnOnce(()) + 'static)`, got `*const dyn for<'a> FnOnce(<u8 as Trait>::Gat<'a>)` | ^^^^^^ expected `*const (dyn FnOnce(()) + 'static)`, got `*const dyn for<'a> FnOnce(<u8 as Trait>::Gat<'a>)`
| |
note: previous use here note: previous use here
--> $DIR/normalize-hidden-types.rs:34:31 --> $DIR/normalize-hidden-types.rs:33:31
| |
LL | fn define_1() -> Opaque { dyn_hoops::<_>(0) } LL | fn define_1() -> Opaque { dyn_hoops::<_>(0) }
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
error[E0308]: mismatched types error[E0308]: mismatched types
--> $DIR/normalize-hidden-types.rs:44:25 --> $DIR/normalize-hidden-types.rs:42:25
| |
LL | type Opaque = impl Sized; LL | type Opaque = impl Sized;
| ---------- the expected opaque type | ---------- the expected opaque type
@ -39,13 +39,13 @@ LL | let _: Opaque = dyn_hoops::<u8>(0);
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
error: concrete type differs from previous defining opaque type use error: concrete type differs from previous defining opaque type use
--> $DIR/normalize-hidden-types.rs:54:25 --> $DIR/normalize-hidden-types.rs:51:25
| |
LL | let _: Opaque = dyn_hoops::<_>(0); LL | let _: Opaque = dyn_hoops::<_>(0);
| ^^^^^^^^^^^^^^^^^ expected `*const (dyn FnOnce(()) + 'static)`, got `*const dyn for<'a> FnOnce(<u8 as Trait>::Gat<'a>)` | ^^^^^^^^^^^^^^^^^ expected `*const (dyn FnOnce(()) + 'static)`, got `*const dyn for<'a> FnOnce(<u8 as Trait>::Gat<'a>)`
| |
note: previous use here note: previous use here
--> $DIR/normalize-hidden-types.rs:56:9 --> $DIR/normalize-hidden-types.rs:52:9
| |
LL | None LL | None
| ^^^^ | ^^^^

6
tests/ui/type-alias-impl-trait/normalize-hidden-types.rs
View File

@ -3,7 +3,7 @@
//@ revisions: current next //@ revisions: current next
//@ [next] compile-flags: -Znext-solver //@ [next] compile-flags: -Znext-solver
//@ [next] check-pass //@ [next] check-pass
//@ [current]: known-bug: #112691 //@ [current] known-bug: #112691
#![feature(type_alias_impl_trait)] #![feature(type_alias_impl_trait)]
@ -23,7 +23,6 @@ mod typeof_1 {
use super::*; use super::*;
type Opaque = impl Sized; type Opaque = impl Sized;
fn define() -> Opaque { fn define() -> Opaque {
//[current]~^ ERROR concrete type differs
dyn_hoops::<_>(0) dyn_hoops::<_>(0)
} }
} }
@ -32,7 +31,6 @@ mod typeof_2 {
use super::*; use super::*;
type Opaque = impl Sized; type Opaque = impl Sized;
fn define_1() -> Opaque { dyn_hoops::<_>(0) } fn define_1() -> Opaque { dyn_hoops::<_>(0) }
//[current]~^ ERROR concrete type differs
fn define_2() -> Opaque { dyn_hoops::<u8>(0) } fn define_2() -> Opaque { dyn_hoops::<u8>(0) }
} }
@ -42,7 +40,6 @@ mod typeck {
fn define() -> Option<Opaque> { fn define() -> Option<Opaque> {
let _: Opaque = dyn_hoops::<_>(0); let _: Opaque = dyn_hoops::<_>(0);
let _: Opaque = dyn_hoops::<u8>(0); let _: Opaque = dyn_hoops::<u8>(0);
//[current]~^ ERROR mismatched types
None None
} }
} }
@ -52,7 +49,6 @@ mod borrowck {
type Opaque = impl Sized; type Opaque = impl Sized;
fn define() -> Option<Opaque> { fn define() -> Option<Opaque> {
let _: Opaque = dyn_hoops::<_>(0); let _: Opaque = dyn_hoops::<_>(0);
//[current]~^ ERROR concrete type differs
None None
} }
} }