From 20431706a863f92cb37dc512fef6e48d192aaf2c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:11:38 +0200 Subject: Merging upstream version 1.66.0+dfsg1. Signed-off-by: Daniel Baumann --- src/test/incremental/hashes/function_interfaces.rs | 2 +- src/test/incremental/issue-61323.rs | 3 +-- src/test/incremental/spans_significant_w_panic.rs | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/test/incremental') diff --git a/src/test/incremental/hashes/function_interfaces.rs b/src/test/incremental/hashes/function_interfaces.rs index 076eddaab..3ff949fbb 100644 --- a/src/test/incremental/hashes/function_interfaces.rs +++ b/src/test/incremental/hashes/function_interfaces.rs @@ -323,7 +323,7 @@ pub fn change_return_impl_trait() -> impl Clone { #[cfg(not(any(cfail1,cfail4)))] #[rustc_clean(cfg = "cfail2")] #[rustc_clean(cfg = "cfail3")] -#[rustc_clean(cfg = "cfail5")] +#[rustc_clean(cfg = "cfail5", except = "typeck")] #[rustc_clean(cfg = "cfail6")] pub fn change_return_impl_trait() -> impl Copy { 0u32 diff --git a/src/test/incremental/issue-61323.rs b/src/test/incremental/issue-61323.rs index 97cbfe408..7ce47947c 100644 --- a/src/test/incremental/issue-61323.rs +++ b/src/test/incremental/issue-61323.rs @@ -1,7 +1,7 @@ // revisions: rpass cfail enum A { - //[cfail]~^ ERROR 3:1: 3:7: recursive type `A` has infinite size [E0072] + //[cfail]~^ ERROR 3:1: 3:7: recursive types `A` and `C` have infinite size [E0072] B(C), } @@ -10,6 +10,5 @@ struct C(Box); #[cfg(cfail)] struct C(A); -//[cfail]~^ ERROR 12:1: 12:9: recursive type `C` has infinite size [E0072] fn main() {} diff --git a/src/test/incremental/spans_significant_w_panic.rs b/src/test/incremental/spans_significant_w_panic.rs index e9e35791a..6f51c9729 100644 --- a/src/test/incremental/spans_significant_w_panic.rs +++ b/src/test/incremental/spans_significant_w_panic.rs @@ -8,7 +8,6 @@ // compile-flags: -C overflow-checks=on -Z query-dep-graph #![feature(rustc_attrs)] -#![feature(bench_black_box)] #![rustc_partition_codegened(module = "spans_significant_w_panic", cfg = "rpass2")] #![rustc_partition_codegened(module = "spans_significant_w_panic", cfg = "rpass4")] -- cgit v1.2.3