Skip to content

Commit a1ef7ab

Browse files
committed
Merge branch 'prelude-asm' into 'master'
Remove asm from prelude, drop feature See merge request redox-os/uefi!9
2 parents 95b35b9 + 64adea2 commit a1ef7ab

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

crates/uefi_std/src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#![no_std]
22
#![feature(abi_efiapi)]
3-
#![feature(asm)]
43
#![feature(concat_idents)]
54
#![feature(core_intrinsics)]
65
#![feature(custom_test_frameworks)]
76
#![feature(format_args_nl)]
8-
#![feature(global_asm)]
97
#![feature(lang_items)]
108
#![feature(log_syntax)]
119
#![feature(prelude_import)]
@@ -115,10 +113,8 @@ pub use core::prelude::v1::{
115113
option_env,
116114
stringify,
117115
// Unstable
118-
asm,
119116
concat_idents,
120117
format_args_nl,
121-
global_asm,
122118
log_syntax,
123119
trace_macros,
124120
};

crates/uefi_std/src/prelude.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
// Re-exported built-in macros
2929
#[doc(no_inline)]
3030
pub use core::prelude::v1::{
31-
asm,
3231
assert,
3332
cfg,
3433
column,
@@ -39,7 +38,6 @@
3938
file,
4039
format_args,
4140
format_args_nl,
42-
global_asm,
4341
include,
4442
include_bytes,
4543
include_str,

0 commit comments

Comments
 (0)