forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#125499 - matthiaskrgr:rollup-84i5z5w, r=matth…
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#125455 (Make `clamp` inline) - rust-lang#125477 (Run rustfmt on files that need it.) - rust-lang#125481 (Fix the dead link in the bootstrap README) - rust-lang#125482 (Notify kobzol after changes to `opt-dist`) - rust-lang#125489 (Revert problematic opaque type change) r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
17 changed files
with
185 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| pub mod ci; | ||
| pub mod git; | ||
| pub mod metrics; | ||
| pub mod util; | ||
| pub mod stage0_parser; | ||
| pub mod util; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| //! This test checks that we allow subtyping predicates that contain opaque types. | ||
| //! No hidden types are being constrained in the subtyping predicate, but type and | ||
| //! lifetime variables get subtyped in the generic parameter list of the opaque. | ||
|
|
||
| use std::iter; | ||
|
|
||
| mod either { | ||
| pub enum Either<L, R> { | ||
| Left(L), | ||
| Right(R), | ||
| } | ||
|
|
||
| impl<L: Iterator, R: Iterator<Item = L::Item>> Iterator for Either<L, R> { | ||
| type Item = L::Item; | ||
| fn next(&mut self) -> Option<Self::Item> { | ||
| todo!() | ||
| } | ||
| } | ||
| pub use self::Either::{Left, Right}; | ||
| } | ||
|
|
||
| pub enum BabeConsensusLogRef<'a> { | ||
| NextEpochData(BabeNextEpochRef<'a>), | ||
| NextConfigData, | ||
| } | ||
|
|
||
| impl<'a> BabeConsensusLogRef<'a> { | ||
| pub fn scale_encoding( | ||
| &self, | ||
| ) -> impl Iterator<Item = impl AsRef<[u8]> + Clone + 'a> + Clone + 'a { | ||
| //~^ ERROR is not satisfied | ||
| //~| ERROR is not satisfied | ||
| //~| ERROR is not satisfied | ||
| match self { | ||
| BabeConsensusLogRef::NextEpochData(digest) => either::Left(either::Left( | ||
| digest.scale_encoding().map(either::Left).map(either::Left), | ||
| )), | ||
| BabeConsensusLogRef::NextConfigData => either::Right( | ||
| // The Opaque type from ``scale_encoding` gets used opaquely here, while the `R` | ||
| // generic parameter of `Either` contains type variables that get subtyped and the | ||
| // opaque type contains lifetime variables that get subtyped. | ||
| iter::once(either::Right(either::Left([1]))) | ||
| .chain(std::iter::once([1]).map(either::Right).map(either::Right)), | ||
| ), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub struct BabeNextEpochRef<'a>(&'a ()); | ||
|
|
||
| impl<'a> BabeNextEpochRef<'a> { | ||
| pub fn scale_encoding( | ||
| &self, | ||
| ) -> impl Iterator<Item = impl AsRef<[u8]> + Clone + 'a> + Clone + 'a { | ||
| std::iter::once([1]) | ||
| } | ||
| } | ||
|
|
||
| fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| error[E0277]: the trait bound `Either<Either<Map<Map<impl Iterator<Item = impl AsRef<[u8]> + Clone + '_> + Clone + '_, fn(impl AsRef<[u8]> + Clone + '_) -> Either<impl AsRef<[u8]> + Clone + '_, _> {Either::<impl AsRef<[u8]> + Clone + '_, _>::Left}>, fn(Either<impl AsRef<[u8]> + Clone + '_, _>) -> Either<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>> {Either::<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>>::Left}>, _>, std::iter::Chain<std::iter::Once<Either<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>>>, Map<Map<std::iter::Once<[{integer}; 1]>, fn([{integer}; 1]) -> Either<[{integer}; 1], [{integer}; 1]> {Either::<[{integer}; 1], [{integer}; 1]>::Right}>, fn(Either<[{integer}; 1], [{integer}; 1]>) -> Either<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>> {Either::<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>>::Right}>>>: Clone` is not satisfied | ||
| --> $DIR/lazy_subtyping_of_opaques.rs:30:10 | ||
| | | ||
| LL | ) -> impl Iterator<Item = impl AsRef<[u8]> + Clone + 'a> + Clone + 'a { | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `Either<Either<Map<Map<impl Iterator<Item = impl AsRef<[u8]> + Clone + '_> + Clone + '_, fn(impl AsRef<[u8]> + Clone + '_) -> Either<impl AsRef<[u8]> + Clone + '_, _> {Either::<impl AsRef<[u8]> + Clone + '_, _>::Left}>, fn(Either<impl AsRef<[u8]> + Clone + '_, _>) -> Either<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>> {Either::<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>>::Left}>, _>, std::iter::Chain<std::iter::Once<Either<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>>>, Map<Map<std::iter::Once<[{integer}; 1]>, fn([{integer}; 1]) -> Either<[{integer}; 1], [{integer}; 1]> {Either::<[{integer}; 1], [{integer}; 1]>::Right}>, fn(Either<[{integer}; 1], [{integer}; 1]>) -> Either<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>> {Either::<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>>::Right}>>>` | ||
|
|
||
| error[E0277]: the trait bound `Either<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>>: AsRef<[u8]>` is not satisfied | ||
| --> $DIR/lazy_subtyping_of_opaques.rs:30:31 | ||
| | | ||
| LL | ) -> impl Iterator<Item = impl AsRef<[u8]> + Clone + 'a> + Clone + 'a { | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `AsRef<[u8]>` is not implemented for `Either<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>>` | ||
|
|
||
| error[E0277]: the trait bound `Either<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>>: Clone` is not satisfied | ||
| --> $DIR/lazy_subtyping_of_opaques.rs:30:31 | ||
| | | ||
| LL | ) -> impl Iterator<Item = impl AsRef<[u8]> + Clone + 'a> + Clone + 'a { | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `Either<Either<impl AsRef<[u8]> + Clone + '_, _>, Either<[{integer}; 1], [{integer}; 1]>>` | ||
|
|
||
| error: aborting due to 3 previous errors | ||
|
|
||
| For more information about this error, try `rustc --explain E0277`. |
30 changes: 30 additions & 0 deletions
30
tests/ui/type-alias-impl-trait/lazy_subtyping_of_opaques.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| #![feature(type_alias_impl_trait)] | ||
|
|
||
| //! This test used to ICE rust-lang/rust#124891 | ||
| //! because we added an assertion for catching cases where opaque types get | ||
| //! registered during the processing of subtyping predicates. | ||
|
|
||
| type Tait = impl FnOnce() -> (); | ||
|
|
||
| fn reify_as_tait() -> Thunk<Tait> { | ||
| Thunk::new(|cont| cont) | ||
| //~^ ERROR: mismatched types | ||
| //~| ERROR: mismatched types | ||
| } | ||
|
|
||
| struct Thunk<F>(F); | ||
|
|
||
| impl<F> Thunk<F> { | ||
| fn new(f: F) | ||
| where | ||
| F: ContFn, | ||
| { | ||
| todo!(); | ||
| } | ||
| } | ||
|
|
||
| trait ContFn {} | ||
|
|
||
| impl<F: FnOnce(Tait) -> ()> ContFn for F {} | ||
|
|
||
| fn main() {} |
26 changes: 26 additions & 0 deletions
26
tests/ui/type-alias-impl-trait/lazy_subtyping_of_opaques.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| error[E0308]: mismatched types | ||
| --> $DIR/lazy_subtyping_of_opaques.rs:10:23 | ||
| | | ||
| LL | type Tait = impl FnOnce() -> (); | ||
| | ------------------- the found opaque type | ||
| ... | ||
| LL | Thunk::new(|cont| cont) | ||
| | ^^^^ expected `()`, found opaque type | ||
| | | ||
| = note: expected unit type `()` | ||
| found opaque type `Tait` | ||
|
|
||
| error[E0308]: mismatched types | ||
| --> $DIR/lazy_subtyping_of_opaques.rs:10:5 | ||
| | | ||
| LL | fn reify_as_tait() -> Thunk<Tait> { | ||
| | ----------- expected `Thunk<_>` because of return type | ||
| LL | Thunk::new(|cont| cont) | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^ expected `Thunk<_>`, found `()` | ||
| | | ||
| = note: expected struct `Thunk<_>` | ||
| found unit type `()` | ||
|
|
||
| error: aborting due to 2 previous errors | ||
|
|
||
| For more information about this error, try `rustc --explain E0308`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters