diff options
| author | bors <bors@rust-lang.org> | 2021-03-07 02:36:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-07 02:36:07 +0000 |
| commit | 66ec64ccf31883cd2c28d045912a76179c0c6ed2 (patch) | |
| tree | c91086d0e3c6cff3ed331adc66931e17281701f8 /compiler/rustc_codegen_cranelift/example/alloc_example.rs | |
| parent | dfe519b344b60e54a2028d3366ca366a228537e3 (diff) | |
| parent | 6220e00ea9a790fb83cf391e2093c260db6d47a1 (diff) | |
| download | rust-66ec64ccf31883cd2c28d045912a76179c0c6ed2.tar.gz rust-66ec64ccf31883cd2c28d045912a76179c0c6ed2.zip | |
Auto merge of #82851 - JohnTitor:rollup-me5ko8g, r=JohnTitor
Rollup of 13 pull requests Successful merges: - #77916 (Change built-in kernel targets to be os = none throughout) - #82130 (Make some Option, Result methods unstably const) - #82292 (Prevent specialized ZipImpl from calling `__iterator_get_unchecked` twice with the same index) - #82402 (Remove RefCell around `module_trait_cache`) - #82592 (Improve transmute docs with further clarifications) - #82651 (Cleanup rustdoc warnings) - #82720 (Fix diagnostic suggests adding type `[type error]`) - #82751 (improve offset_from docs) - #82793 (Move some tests to more suitable subdirs) - #82803 (rustdoc: Add an unstable option to print all unversioned files) - #82808 (Sync rustc_codegen_cranelift) - #82822 (Fix typo) - #82837 (tweak MaybeUninit docs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_cranelift/example/alloc_example.rs')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/example/alloc_example.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_cranelift/example/alloc_example.rs b/compiler/rustc_codegen_cranelift/example/alloc_example.rs index f59600ebb33..71e93e87b6c 100644 --- a/compiler/rustc_codegen_cranelift/example/alloc_example.rs +++ b/compiler/rustc_codegen_cranelift/example/alloc_example.rs @@ -1,4 +1,4 @@ -#![feature(start, box_syntax, alloc_system, core_intrinsics, alloc_prelude, alloc_error_handler)] +#![feature(start, box_syntax, core_intrinsics, alloc_prelude, alloc_error_handler)] #![no_std] extern crate alloc; |