roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-11-09 22:54:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use IdentStr::default over ::empty

Browse Source
This commit is contained in:
Richard Feldman 2021-08-03 07:15:41 -04:00
parent 00eefa1947
commit 35c202bfb2
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
compiler/ident/src/lib.rs
View File

@ -65,13 +65,6 @@ impl IdentStr {
last_byte != 0
}
pub fn empty() -> Self {
IdentStr {
length: 0,
elements: core::ptr::null_mut(),
}
}
pub fn get(&self, index: usize) -> Option<&u8> {
if index < self.len() {
Some(unsafe {
@ -106,8 +99,9 @@ impl IdentStr {
match len.cmp(&mem::size_of::<Self>()) {
Ordering::Less => {
// This fits in a small string, but needs its length recorded
let mut answer_bytes: [u8; mem::size_of::<Self>()] =
unsafe { mem::transmute::<Self, [u8; mem::size_of::<Self>()]>(Self::empty()) };
let mut answer_bytes: [u8; mem::size_of::<Self>()] = unsafe {
mem::transmute::<Self, [u8; mem::size_of::<Self>()]>(Self::default())
};
// Copy the bytes from the slice into the answer
let dest_slice =
@ -132,8 +126,9 @@ impl IdentStr {
Ordering::Equal => {
// This fits in a small string, and is exactly long enough to
// take up the entire available struct
let mut answer_bytes: [u8; mem::size_of::<Self>()] =
unsafe { mem::transmute::<Self, [u8; mem::size_of::<Self>()]>(Self::empty()) };
let mut answer_bytes: [u8; mem::size_of::<Self>()] = unsafe {
mem::transmute::<Self, [u8; mem::size_of::<Self>()]>(Self::default())
};
// Copy the bytes from the slice into the answer
let dest_slice = unsafe {
@ -206,6 +201,15 @@ impl IdentStr {
}
}
impl Default for IdentStr {
fn default() -> Self {
Self {
length: 0,
elements: core::ptr::null_mut(),
}
}
}
impl From<&str> for IdentStr {
fn from(str: &str) -> Self {
Self::from_slice(str.as_bytes())
@ -276,8 +280,8 @@ impl Drop for IdentStr {
}
#[test]
fn empty() {
let answer = IdentStr::empty();
fn default() {
let answer = IdentStr::default();
assert_eq!(answer.len(), 0);
assert_eq!(answer, answer);