roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-09-21 07:49:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use core over std in bindgen

Browse Source
This commit is contained in:
Richard Feldman 2022-05-11 10:12:20 -04:00
parent 3932300abd
commit 60fce86326
No known key found for this signature in database
GPG Key ID: 7E4127D1E4241798
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bindgen/src/bindgen_rs.rs
View File

@ -107,7 +107,7 @@ fn write_tag_union(
// #[repr(C)]
// union union_MyTagUnion {
// Bar: u128,
// Foo: std::mem::ManuallyDrop<roc_std::RocStr>,
// Foo: core::mem::ManuallyDrop<roc_std::RocStr>,
// }
let variant_name = format!("union_{}", name);
@ -129,7 +129,7 @@ fn write_tag_union(
// know how to drop them automatically!
writeln!(
buf,
"std::mem::ManuallyDrop<{}>,",
"core::mem::ManuallyDrop<{}>,",
type_name(*payload_id, types)
)?;
} else {
@ -187,7 +187,7 @@ fn write_tag_union(
// Self {
// tag: tag_MyTagUnion::Foo,
// variant: variant_MyTagUnion {
// Foo: std::mem::ManuallyDrop::new(payload),
// Foo: core::mem::ManuallyDrop::new(payload),
// },
// }
// }
@ -195,7 +195,7 @@ fn write_tag_union(
let payload_type = types.get(*payload_id);
let payload_name = if payload_type.has_pointer(types) {
"std::mem::ManuallyDrop::new(payload)"
"core::mem::ManuallyDrop::new(payload)"
} else {
"payload"
};
@ -254,7 +254,7 @@ fn write_tag_union(
match opt_payload_id {
Some(payload_id) if types.get(payload_id).has_pointer(types) => {
format!(
"unsafe {{ std::mem::ManuallyDrop::drop(&mut self.variant.{}) }},",
"unsafe {{ core::mem::ManuallyDrop::drop(&mut self.variant.{}) }},",
tag_name
)
}
@ -394,7 +394,7 @@ fn write_tag_union(
indoc!(
r#"
impl Ord for {} {{
fn cmp(&self, other: &Self) -> std::cmp::Ordering {{
fn cmp(&self, other: &Self) -> core::cmp::Ordering {{
match self.tag.cmp(&other.tag) {{
core::cmp::Ordering::Equal => {{}}
not_eq => return not_eq,

8
bindgen/tests/gen_rs.rs
View File

@ -199,7 +199,7 @@ fn tag_union_aliased() {
pub union union_MyTagUnion {
Bar: u128,
Blah: i32,
Foo: std::mem::ManuallyDrop<roc_std::RocStr>,
Foo: core::mem::ManuallyDrop<roc_std::RocStr>,
}
#[repr(C)]
@ -242,7 +242,7 @@ fn tag_union_aliased() {
Self {
tag: tag_MyTagUnion::Foo,
variant: union_MyTagUnion {
Foo: std::mem::ManuallyDrop::new(payload)
Foo: core::mem::ManuallyDrop::new(payload)
},
}
}
@ -254,7 +254,7 @@ fn tag_union_aliased() {
tag_MyTagUnion::Bar => {}
tag_MyTagUnion::Baz => {}
tag_MyTagUnion::Blah => {}
tag_MyTagUnion::Foo => unsafe { std::mem::ManuallyDrop::drop(&mut self.variant.Foo) },
tag_MyTagUnion::Foo => unsafe { core::mem::ManuallyDrop::drop(&mut self.variant.Foo) },
}
}
}
@ -297,7 +297,7 @@ fn tag_union_aliased() {
}
impl Ord for MyTagUnion {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
fn cmp(&self, other: &Self) -> core::cmp::Ordering {
match self.tag.cmp(&other.tag) {
core::cmp::Ordering::Equal => {}
not_eq => return not_eq,