fix tests

library/alloc/tests/vec.rs

@@ -2,7 +2,7 @@ use core::assert_eq;
 use core::iter::IntoIterator;
 use core::num::NonZeroUsize;
 use core::ptr::NonNull;
-use std::alloc::{Allocator, Layout, System, FallibleAdapter, IntoLayout, handle_alloc_error};
+use std::alloc::{Allocator, Layout, System, Fatal};
 use std::assert_matches::assert_matches;
 use std::borrow::Cow;
 use std::cell::Cell;
@@ -1096,16 +1096,7 @@ fn test_into_iter_drop_allocator() {
             unsafe { System.deallocate(ptr, layout) }
         }
 
-        type Result<T, E: std::error::Error> = T
-        where
-            E: IntoLayout;
-
-        fn map_result<T, E: std::error::Error>(result: Result<T, E>) -> Self::Result<T, E>
-        where
-            E: IntoLayout
-        {
-            result.unwrap_or_else(|e| handle_alloc_error(e.into_layout()))
-        }
+        type ErrorHandling = Fatal;
     }
 
     let mut drop_count = 0;

tests/ui/allocator/object-safe.rs

@@ -4,9 +4,9 @@
 
 #![feature(allocator_api)]
 
-use std::alloc::{Allocator, System};
+use std::alloc::{Allocator, System, Fatal};
 
-fn ensure_object_safe(_: &dyn Allocator) {}
+fn ensure_object_safe(_: &dyn Allocator<ErrorHandling = Fatal>) {}
 
 fn main() {
     ensure_object_safe(&System);

tests/ui/box/large-allocator-ice.rs

@@ -2,7 +2,7 @@
 #![feature(allocator_api)]
 #![allow(unused_must_use)]
 
-use std::alloc::Allocator;
+use std::alloc::{Allocator, Fatal};
 
 struct BigAllocator([usize; 2]);
 
@@ -16,6 +16,7 @@ unsafe impl Allocator for BigAllocator {
     unsafe fn deallocate(&self, _: std::ptr::NonNull<u8>, _: std::alloc::Layout) {
         todo!()
     }
+    type ErrorHandling = Fatal;
 }
 
 fn main() {

tests/ui/box/leak-alloc.rs

@@ -1,6 +1,6 @@
 #![feature(allocator_api)]
 
-use std::alloc::{AllocError, Allocator, Layout, System};
+use std::alloc::{AllocError, Allocator, Layout, System, Fatal};
 use std::ptr::NonNull;
 
 use std::boxed::Box;
@@ -15,6 +15,8 @@ unsafe impl Allocator for Alloc {
     unsafe fn deallocate(&self, ptr: NonNull<u8>, layout: Layout) {
         System.deallocate(ptr, layout)
     }
+
+    type ErrorHandling = Fatal;
 }
 
 fn use_value(_: u32) {}

tests/ui/box/leak-alloc.stderr

@@ -1,5 +1,5 @@
 error[E0505]: cannot move out of `alloc` because it is borrowed
-  --> $DIR/leak-alloc.rs:26:10
+  --> $DIR/leak-alloc.rs:28:10
    |
 LL |     let alloc = Alloc {};
    |         ----- binding `alloc` declared here

tests/ui/debuginfo/debuginfo-box-with-large-allocator.rs

@@ -4,7 +4,7 @@
 
 #![feature(allocator_api)]
 
-use std::alloc::{AllocError, Allocator, Layout};
+use std::alloc::{AllocError, Allocator, Layout, Fatal};
 use std::ptr::NonNull;
 
 struct ZST;
@@ -16,6 +16,7 @@ unsafe impl Allocator for &ZST {
     unsafe fn deallocate(&self, ptr: NonNull<u8>, layout: Layout) {
         todo!()
     }
+    type ErrorHandling = Fatal;
 }
 
 fn main() {

tests/ui/error-codes/E0401.stderr

@@ -53,7 +53,7 @@ LL |     bfnr(x);
            - impl<A, F> Fn<A> for &F
              where A: Tuple, F: Fn<A>, F: ?Sized;
            - impl<Args, F, A> Fn<Args> for Box<F, A>
-             where Args: Tuple, F: Fn<Args>, A: alloc::falloc::Allocator, F: ?Sized;
+             where Args: Tuple, F: Fn<Args>, A: Allocator, F: ?Sized;
 note: required by a bound in `bfnr`
   --> $DIR/E0401.rs:4:30
    |

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

@@ -6,7 +6,7 @@ LL | impl AsRef<Q> for Box<Q> {
    |
    = note: conflicting implementation in crate `alloc`:
            - impl<T, A> AsRef<T> for Box<T, A>
-             where A: alloc::falloc::Allocator, T: ?Sized;
+             where A: Allocator, T: ?Sized;
 
 error[E0119]: conflicting implementations of trait `From<S>` for type `S`
   --> $DIR/conflict-with-std.rs:12:1

tests/ui/hygiene/panic-location.run.stderr

@@ -1,2 +1,2 @@
-thread 'main' panicked at 'capacity overflow', library/alloc/src/falloc.rs:94:5
+thread 'main' panicked at 'capacity overflow', library/alloc/src/falloc.rs:518:5
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace