about summary refs log tree commit diff
path: root/compiler/rustc_codegen_gcc/example/alloc_example.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-10-16 06:31:40 +0000
committerbors <bors@rust-lang.org>2021-10-16 06:31:40 +0000
commit7fbd4ce2768744b3bd2ddf8453b73f4f18dbe5bc (patch)
treea48662f4f9bb7838999ffaa5042f953bd588447b /compiler/rustc_codegen_gcc/example/alloc_example.rs
parent6cc0a764e082d9c0abcf37a768d5889247ba13e2 (diff)
parent8e2047042581da8ee5ab8c7ad5780c1d690eecea (diff)
downloadrust-7fbd4ce2768744b3bd2ddf8453b73f4f18dbe5bc.tar.gz
rust-7fbd4ce2768744b3bd2ddf8453b73f4f18dbe5bc.zip
Auto merge of #89939 - matthiaskrgr:rollup-q3lrdck, r=matthiaskrgr
Rollup of 10 pull requests

Successful merges:

 - #89509 (Stabilize `unreachable_unchecked` as `const fn`)
 - #89898 (Remove alloc::prelude)
 - #89902 (Restrict the aarch64 outline atomics test to Linux)
 - #89906 (Moved format-version constant to rustdoc-json-types)
 - #89912 (emitter: current substitution can be multi-line)
 - #89914 (Emit impl difference error for GenericBoundFailure too)
 - #89915 (Some outlives cleanup)
 - #89918 (Add some GATs related regression tests)
 - #89921 ([fuchsia] Update process info struct)
 - #89925 (updating docs to mention usage of AtomicBool)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc/example/alloc_example.rs')
-rw-r--r--compiler/rustc_codegen_gcc/example/alloc_example.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_gcc/example/alloc_example.rs b/compiler/rustc_codegen_gcc/example/alloc_example.rs
index bc6dd007ba0..74ea7ec4ede 100644
--- a/compiler/rustc_codegen_gcc/example/alloc_example.rs
+++ b/compiler/rustc_codegen_gcc/example/alloc_example.rs
@@ -1,10 +1,10 @@
-#![feature(start, box_syntax, core_intrinsics, alloc_prelude, alloc_error_handler)]
+#![feature(start, box_syntax, core_intrinsics, alloc_error_handler)]
 #![no_std]
 
 extern crate alloc;
 extern crate alloc_system;
 
-use alloc::prelude::v1::*;
+use alloc::boxed::Box;
 
 use alloc_system::System;