Skip to content

Commit bbc8757

Browse files
committed
fix tests
changes fixed codegen/vec-shrink-panik
1 parent 8528f66 commit bbc8757

File tree

4 files changed

+3
-22
lines changed

4 files changed

+3
-22
lines changed

tests/codegen/vec-shrink-panik.rs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,13 @@ pub fn shrink_to_fit(vec: &mut Vec<u32>) {
2222
// CHECK-LABEL: @issue71861
2323
#[no_mangle]
2424
pub fn issue71861(vec: Vec<u32>) -> Box<[u32]> {
25-
// CHECK-NOT: panic
26-
27-
// Call to panic_cannot_unwind in case of double-panic is expected
28-
// on LLVM 16 and older, but other panics are not.
29-
// old: filter
30-
// old-NEXT: ; call core::panicking::panic_cannot_unwind
31-
// old-NEXT: panic_cannot_unwind
32-
3325
// CHECK-NOT: panic
3426
vec.into_boxed_slice()
3527
}
3628

3729
// CHECK-LABEL: @issue75636
3830
#[no_mangle]
3931
pub fn issue75636<'a>(iter: &[&'a str]) -> Box<[&'a str]> {
40-
// CHECK-NOT: panic
41-
42-
// Call to panic_cannot_unwind in case of double-panic is expected,
43-
// on LLVM 16 and older, but other panics are not.
44-
// old: filter
45-
// old-NEXT: ; call core::panicking::panic_cannot_unwind
46-
// old-NEXT: panic_cannot_unwind
47-
4832
// CHECK-NOT: panic
4933
iter.iter().copied().collect()
5034
}
51-
52-
// old: ; core::panicking::panic_cannot_unwind
53-
// old: declare void @{{.*}}panic_cannot_unwind

tests/ui/error-codes/E0401.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ LL | bfnr(x);
5353
- impl<A, F> Fn<A> for &F
5454
where A: Tuple, F: Fn<A>, F: ?Sized;
5555
- impl<Args, F, A> Fn<Args> for Box<F, A>
56-
where Args: Tuple, F: Fn<Args>, A: Allocator, F: ?Sized;
56+
where Args: Tuple, F: Fn<Args>, A: alloc::falloc::Allocator, F: ?Sized;
5757
note: required by a bound in `bfnr`
5858
--> $DIR/E0401.rs:4:30
5959
|

tests/ui/error-codes/e0119/conflict-with-std.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | impl AsRef<Q> for Box<Q> {
66
|
77
= note: conflicting implementation in crate `alloc`:
88
- impl<T, A> AsRef<T> for Box<T, A>
9-
where A: Allocator, T: ?Sized;
9+
where A: alloc::falloc::Allocator, T: ?Sized;
1010

1111
error[E0119]: conflicting implementations of trait `From<S>` for type `S`
1212
--> $DIR/conflict-with-std.rs:12:1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
thread 'main' panicked at 'capacity overflow', library/alloc/src/raw_vec.rs:524:5
1+
thread 'main' panicked at 'capacity overflow', library/alloc/src/falloc.rs:84:5
22
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

0 commit comments

Comments
 (0)