Skip to content

Commit d2327ab

Browse files
sunfishcodesunfishcode
committed
Fully-qualify core in macro expansions.
1 parent 407e94a commit d2327ab

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎crates/rust/src/bindgen.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,14 +270,14 @@ impl Bindgen for FunctionBindgen<'_, '_> {
270270
self.import_return_pointer_area_align.max(align);
271271
uwrite!(
272272
self.src,
273-
"let ptr{tmp} = ret_area.0.as_mut_ptr().cast::<core::ffi::c_void>();"
273+
"let ptr{tmp} = ret_area.0.as_mut_ptr().cast::<::core::ffi::c_void>();"
274274
);
275275
} else {
276276
self.gen.return_pointer_area_size = self.gen.return_pointer_area_size.max(size);
277277
self.gen.return_pointer_area_align = self.gen.return_pointer_area_align.max(align);
278278
uwriteln!(
279279
self.src,
280-
"let ptr{tmp} = _RET_AREA.0.as_mut_ptr().cast::<core::ffi::c_void>();"
280+
"let ptr{tmp} = _RET_AREA.0.as_mut_ptr().cast::<::core::ffi::c_void>();"
281281
);
282282
}
283283
format!("ptr{}", tmp)
@@ -321,9 +321,9 @@ impl Bindgen for FunctionBindgen<'_, '_> {
321321
WasmType::I64 => results.push("0i64".to_string()),
322322
WasmType::F32 => results.push("0.0f32".to_string()),
323323
WasmType::F64 => results.push("0.0f64".to_string()),
324-
WasmType::Pointer => results.push("core::ptr::null_mut()".to_string()),
324+
WasmType::Pointer => results.push("::core::ptr::null_mut()".to_string()),
325325
WasmType::PointerOrI64 => {
326-
results.push("core::mem::MaybeUninit::<u64>::zeroed()".to_string())
326+
results.push("::core::mem::MaybeUninit::<u64>::zeroed()".to_string())
327327
}
328328
WasmType::Length => results.push("0usize".to_string()),
329329
}
@@ -659,7 +659,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
659659
self.push_str(&format!("let {} = ({}).into_boxed_slice();\n", val, op0));
660660
}
661661
self.push_str(&format!(
662-
"let {} = {}.as_ptr().cast::<core::ffi::c_void>();\n",
662+
"let {} = {}.as_ptr().cast::<::core::ffi::c_void>();\n",
663663
ptr, val
664664
));
665665
self.push_str(&format!("let {} = {}.len();\n", len, val));
@@ -694,7 +694,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
694694
self.push_str(&format!("let {} = ({}).into_boxed_slice();\n", val, op0));
695695
}
696696
self.push_str(&format!(
697-
"let {} = {}.as_ptr().cast::<core::ffi::c_void>();\n",
697+
"let {} = {}.as_ptr().cast::<::core::ffi::c_void>();\n",
698698
ptr, val
699699
));
700700
self.push_str(&format!("let {} = {}.len();\n", len, val));
@@ -742,7 +742,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
742742
));
743743
self.push_str(&format!("let {result} = if {layout}.size() != 0 {{\n"));
744744
self.push_str(&format!(
745-
"let ptr = {alloc}::alloc({layout}).cast::<core::ffi::c_void>();\n",
745+
"let ptr = {alloc}::alloc({layout}).cast::<::core::ffi::c_void>();\n",
746746
));
747747
self.push_str(&format!(
748748
"if ptr.is_null()\n{{\n{alloc}::handle_alloc_error({layout});\n}}\nptr\n}}",
@@ -950,7 +950,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
950950
let tmp = self.tmp();
951951
uwriteln!(
952952
self.src,
953-
"let l{tmp} = *{}.byte_add({offset}).cast::<*mut core::ffi::c_void>();",
953+
"let l{tmp} = *{}.byte_add({offset}).cast::<*mut ::core::ffi::c_void>();",
954954
operands[0]
955955
);
956956
results.push(format!("l{tmp}"));
@@ -1004,7 +1004,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
10041004

10051005
Instruction::PointerStore { offset } => {
10061006
self.push_str(&format!(
1007-
"*{}.byte_add({}).cast::<*mut core::ffi::c_void>() = {};\n",
1007+
"*{}.byte_add({}).cast::<*mut ::core::ffi::c_void>() = {};\n",
10081008
operands[1], offset, operands[0]
10091009
));
10101010
}

‎crates/rust/src/interface.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ impl InterfaceGenerator<'_> {
269269
self.src,
270270
"
271271
#[repr(align({align}))]
272-
struct _RetArea([core::mem::MaybeUninit::<u8>; {size}]);
273-
static mut _RET_AREA: _RetArea = _RetArea([core::mem::MaybeUninit::uninit(); {size}]);
272+
struct _RetArea([::core::mem::MaybeUninit::<u8>; {size}]);
273+
static mut _RET_AREA: _RetArea = _RetArea([::core::mem::MaybeUninit::uninit(); {size}]);
274274
",
275275
align = self.return_pointer_area_align,
276276
size = self.return_pointer_area_size,
@@ -396,8 +396,8 @@ impl InterfaceGenerator<'_> {
396396
self.src,
397397
"
398398
#[repr(align({import_return_pointer_area_align}))]
399-
struct RetArea([core::mem::MaybeUninit::<u8>; {import_return_pointer_area_size}]);
400-
let mut ret_area = RetArea([core::mem::MaybeUninit::uninit(); {import_return_pointer_area_size}]);
399+
struct RetArea([::core::mem::MaybeUninit::<u8>; {import_return_pointer_area_size}]);
400+
let mut ret_area = RetArea([::core::mem::MaybeUninit::uninit(); {import_return_pointer_area_size}]);
401401
",
402402
);
403403
}

‎crates/rust/src/lib.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ impl RustWasm {
379379
self.rt_module.insert(RuntimeItem::StdAllocModule);
380380
self.src.push_str(
381381
"\
382-
pub unsafe fn cabi_dealloc(ptr: *mut core::ffi::c_void, size: usize, align: usize) {
382+
pub unsafe fn cabi_dealloc(ptr: *mut ::core::ffi::c_void, size: usize, align: usize) {
383383
if size == 0 {
384384
return;
385385
}
@@ -444,7 +444,7 @@ pub unsafe fn bool_lift(val: u8) -> bool {
444444
_ => panic!(\"invalid bool discriminant\"),
445445
}
446446
} else {
447-
core::mem::transmute::<u8, bool>(val)
447+
::core::mem::transmute::<u8, bool>(val)
448448
}
449449
}
450450
",
@@ -1248,15 +1248,15 @@ fn wasm_type(ty: WasmType) -> &'static str {
12481248
WasmType::I64 => "i64",
12491249
WasmType::F32 => "f32",
12501250
WasmType::F64 => "f64",
1251-
WasmType::Pointer => "*mut core::ffi::c_void",
1251+
WasmType::Pointer => "*mut ::core::ffi::c_void",
12521252
WasmType::Length => "usize",
12531253

12541254
// `PointerOrI64` can hold either a `u64` or a pointer with provenance.
12551255
// Neither a `u64` nor a pointer type can portably do both, so we use
12561256
// `MaybeUninit<u64>`, since `MaybeUninit` is [documented] to preserve
12571257
// provenance.
12581258
// [documented]: https://github.com/rust-lang/rfcs/blob/master/text/3559-rust-has-provenance.md#reference-level-explanation
1259-
WasmType::PointerOrI64 => "core::mem::MaybeUninit::<u64>",
1259+
WasmType::PointerOrI64 => "::core::mem::MaybeUninit::<u64>",
12601260
}
12611261
}
12621262

@@ -1283,7 +1283,7 @@ fn bitcast(casts: &[Bitcast], operands: &[String], results: &mut Vec<String>) {
12831283
Bitcast::I64ToF32 => format!("f32::from_bits({} as u32)", operand),
12841284

12851285
// Convert an `i64` into a `MaybeUninit<u64>`.
1286-
Bitcast::I64ToP64 => format!("core::mem::MaybeUninit::new({} as u64)", operand),
1286+
Bitcast::I64ToP64 => format!("::core::mem::MaybeUninit::new({} as u64)", operand),
12871287
// Convert a `MaybeUninit<u64>` holding an `i64` value back into
12881288
// the `i64` value.
12891289
Bitcast::P64ToI64 => format!("{}.assume_init() as i64", operand),
@@ -1292,7 +1292,7 @@ fn bitcast(casts: &[Bitcast], operands: &[String], results: &mut Vec<String>) {
12921292
Bitcast::PToP64 => {
12931293
format!(
12941294
"{{
1295-
let mut t = core::mem::MaybeUnunit::<u64>::uninit();
1295+
let mut t = ::core::mem::MaybeUnunit::<u64>::uninit();
12961296
t.as_mut_ptr().cast::<*mut core::ptr::c_void>().write({});
12971297
t
12981298
}}",

0 commit comments

Comments
 (0)