diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-09 08:52:46 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-09 08:52:46 +0000 |
| commit | 5d85a24442bb478745876b73ebbada623c1b629e (patch) | |
| tree | 06476b19bb0aadf1086e9785a82e85e918e03b40 /src/allocator.rs | |
| parent | fea943debfab3859853ef623e06248ffbfd603ab (diff) | |
| download | rust-5d85a24442bb478745876b73ebbada623c1b629e.tar.gz rust-5d85a24442bb478745876b73ebbada623c1b629e.zip | |
Merge commit '81dc066758ec150b43822d4a0c84aae20fe10f40' into sync_cg_clif-2023-10-09
Diffstat (limited to 'src/allocator.rs')
| -rw-r--r-- | src/allocator.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/allocator.rs b/src/allocator.rs index 4e4c595de82..e8af3e8c255 100644 --- a/src/allocator.rs +++ b/src/allocator.rs @@ -1,8 +1,6 @@ //! Allocator shim // Adapted from rustc -use crate::prelude::*; - use rustc_ast::expand::allocator::{ alloc_error_handler_name, default_fn_name, global_fn_name, AllocatorKind, AllocatorTy, ALLOCATOR_METHODS, NO_ALLOC_SHIM_IS_UNSTABLE, @@ -10,6 +8,8 @@ use rustc_ast::expand::allocator::{ use rustc_codegen_ssa::base::allocator_kind_for_codegen; use rustc_session::config::OomStrategy; +use crate::prelude::*; + /// Returns whether an allocator shim was created pub(crate) fn codegen( tcx: TyCtxt<'_>, |