diff options
| author | bors <bors@rust-lang.org> | 2022-02-11 17:39:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-11 17:39:34 +0000 |
| commit | 6499c5e7fc173a3f55b7a3bd1e6a50e9edef782d (patch) | |
| tree | 1d240cbc577c36af2d033bbee49197e158d82f7f /src/test/incremental | |
| parent | 78450d2d602b06d9b94349aaf8cece1a4acaf3a8 (diff) | |
| parent | d54195db22421c51fd14560aba3bbf9b79a52677 (diff) | |
| download | rust-6499c5e7fc173a3f55b7a3bd1e6a50e9edef782d.tar.gz rust-6499c5e7fc173a3f55b7a3bd1e6a50e9edef782d.zip | |
Auto merge of #93893 - oli-obk:sad_revert, r=oli-obk
Revert lazy TAIT PR Revert https://github.com/rust-lang/rust/pull/92306 (sorry `@Aaron1011,` will include your changes in the fix PR) Revert https://github.com/rust-lang/rust/pull/93783 Revert https://github.com/rust-lang/rust/pull/92007 fixes https://github.com/rust-lang/rust/issues/93788 fixes https://github.com/rust-lang/rust/issues/93794 fixes https://github.com/rust-lang/rust/issues/93821 fixes https://github.com/rust-lang/rust/issues/93831 fixes https://github.com/rust-lang/rust/issues/93841
Diffstat (limited to 'src/test/incremental')
| -rw-r--r-- | src/test/incremental/hashes/function_interfaces.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/incremental/hashes/function_interfaces.rs b/src/test/incremental/hashes/function_interfaces.rs index 31564a0cbd5..4124eada188 100644 --- a/src/test/incremental/hashes/function_interfaces.rs +++ b/src/test/incremental/hashes/function_interfaces.rs @@ -305,7 +305,7 @@ pub fn return_impl_trait() -> i32 { } #[cfg(not(any(cfail1,cfail4)))] -#[rustc_clean(cfg = "cfail2", except = "hir_owner, hir_owner_nodes, typeck, fn_sig, optimized_mir")] +#[rustc_clean(cfg = "cfail2", except = "hir_owner, hir_owner_nodes, typeck, fn_sig")] #[rustc_clean(cfg = "cfail3")] #[rustc_clean(cfg = "cfail5", except = "hir_owner, hir_owner_nodes, typeck, fn_sig, optimized_mir")] #[rustc_clean(cfg = "cfail6")] |