Skip to content

Simplify iteration, and remove unsafe #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simplify iteration, and remove unsafe #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ repository = "magiclen/Byte-Unit"
branch = "master"

[dependencies]
utf8-width = "0.1"

serde = { version = "1", optional = true }

[features]
Expand Down
54 changes: 23 additions & 31 deletions src/byte.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ use alloc::string::String;

use alloc::fmt::{self, Display, Formatter};

use crate::{
get_char_from_bytes, read_xib, AdjustedByte, ByteError, ByteUnit, ValueIncorrectError,
};
use crate::{read_xib, AdjustedByte, ByteError, ByteUnit, ValueIncorrectError};

#[cfg(feature = "serde")]
use crate::serde::ser::{Serialize, Serializer};
Expand Down Expand Up @@ -177,56 +175,53 @@ impl Byte {
pub fn from_str<S: AsRef<str>>(s: S) -> Result<Byte, ByteError> {
let s = s.as_ref().trim();

let mut bytes = s.bytes();
let mut chars = s.chars();

let mut value = match bytes.next() {
let mut value = match chars.next() {
Some(e) => {
match e {
b'0'..=b'9' => f64::from(e - b'0'),
'0'..='9' => f64::from(e as u8 - b'0'),
_ => {
return Err(
ValueIncorrectError::NotNumber(get_char_from_bytes(e, bytes)).into()
);
return Err(ValueIncorrectError::NotNumber(e).into());
}
}
}
None => return Err(ValueIncorrectError::NoValue.into()),
};

let e = 'outer: loop {
match bytes.next() {
match chars.next() {
Some(e) => {
match e {
b'0'..=b'9' => {
value = value * 10.0 + f64::from(e - b'0');
'0'..='9' => {
value = value * 10.0 + f64::from(e as u8 - b'0');
}
b'.' => {
'.' => {
let mut i = 0.1;

loop {
match bytes.next() {
match chars.next() {
Some(e) => {
match e {
b'0'..=b'9' => {
value += f64::from(e - b'0') * i;
'0'..='9' => {
value += f64::from(e as u8 - b'0') * i;

i /= 10.0;
}
_ => {
if (i * 10.0) as u8 == 1 {
return Err(ValueIncorrectError::NotNumber(
get_char_from_bytes(e, bytes),
)
.into());
return Err(
ValueIncorrectError::NotNumber(e).into()
);
}

match e {
b' ' => {
' ' => {
loop {
match bytes.next() {
match chars.next() {
Some(e) => {
match e {
b' ' => (),
' ' => (),
_ => break 'outer Some(e),
}
}
Expand All @@ -241,23 +236,20 @@ impl Byte {
}
None => {
if (i * 10.0) as u8 == 1 {
return Err(ValueIncorrectError::NotNumber(
get_char_from_bytes(e, bytes),
)
.into());
return Err(ValueIncorrectError::NotNumber(e).into());
}

break 'outer None;
}
}
}
}
b' ' => {
' ' => {
loop {
match bytes.next() {
match chars.next() {
Some(e) => {
match e {
b' ' => (),
' ' => (),
_ => break 'outer Some(e),
}
}
Expand All @@ -272,7 +264,7 @@ impl Byte {
}
};

let unit = read_xib(e, bytes)?;
let unit = read_xib(e, chars)?;

let bytes = get_bytes(value, unit);

Expand Down
85 changes: 33 additions & 52 deletions src/byte_unit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
extern crate utf8_width;

use core::convert::TryFrom;
use core::str::{from_utf8_unchecked, Bytes, FromStr};
use core::str::{Chars, FromStr};

#[cfg(feature = "serde")]
use alloc::string::String;
Expand Down Expand Up @@ -82,9 +80,9 @@ impl ByteUnit {
pub fn from_str<S: AsRef<str>>(unit: S) -> Result<ByteUnit, UnitIncorrectError> {
let s = unit.as_ref().trim();

let mut bytes = s.bytes();
let mut chars = s.chars();

read_xib(bytes.next(), bytes)
read_xib(chars.next(), chars)
}

/// Use string slice to represent this `ByteUnit`.
Expand Down Expand Up @@ -224,85 +222,68 @@ impl FromStr for ByteUnit {
}
}

#[inline]
pub(crate) fn get_char_from_bytes(e: u8, mut bytes: Bytes) -> char {
let width = unsafe { utf8_width::get_width_assume_valid(e) };

let mut char_bytes = [e; 4];

if width > 1 {
for e in char_bytes[1..].iter_mut().take(width - 1) {
*e = bytes.next().unwrap();
}
}

let char_str = unsafe { from_utf8_unchecked(&char_bytes[..width]) };

char::from_str(char_str).unwrap()
}

pub(crate) fn read_xib(e: Option<u8>, mut bytes: Bytes) -> Result<ByteUnit, UnitIncorrectError> {
pub(crate) fn read_xib(e: Option<char>, mut chars: Chars) -> Result<ByteUnit, UnitIncorrectError> {
match e {
Some(e) => {
match e.to_ascii_uppercase() {
b'B' => {
match bytes.next() {
'B' => {
match chars.next() {
Some(e) => {
Err(UnitIncorrectError {
character: get_char_from_bytes(e, bytes),
character: e,
expected_characters: &[],
also_expect_no_character: false,
})
}
None => Ok(ByteUnit::B),
}
}
b'K' => {
if read_ib(bytes)? {
'K' => {
if read_ib(chars)? {
Ok(ByteUnit::KiB)
} else {
Ok(ByteUnit::KB)
}
}
b'M' => {
if read_ib(bytes)? {
'M' => {
if read_ib(chars)? {
Ok(ByteUnit::MiB)
} else {
Ok(ByteUnit::MB)
}
}
b'G' => {
if read_ib(bytes)? {
'G' => {
if read_ib(chars)? {
Ok(ByteUnit::GiB)
} else {
Ok(ByteUnit::GB)
}
}
b'T' => {
if read_ib(bytes)? {
'T' => {
if read_ib(chars)? {
Ok(ByteUnit::TiB)
} else {
Ok(ByteUnit::TB)
}
}
b'P' => {
if read_ib(bytes)? {
'P' => {
if read_ib(chars)? {
Ok(ByteUnit::PiB)
} else {
Ok(ByteUnit::PB)
}
}
#[cfg(feature = "u128")]
b'E' => {
if read_ib(bytes)? {
'E' => {
if read_ib(chars)? {
Ok(ByteUnit::EiB)
} else {
Ok(ByteUnit::EB)
}
}
#[cfg(feature = "u128")]
b'Z' => {
if read_ib(bytes)? {
'Z' => {
if read_ib(chars)? {
Ok(ByteUnit::ZiB)
} else {
Ok(ByteUnit::ZB)
Expand All @@ -312,15 +293,15 @@ pub(crate) fn read_xib(e: Option<u8>, mut bytes: Bytes) -> Result<ByteUnit, Unit
#[cfg(feature = "u128")]
{
Err(UnitIncorrectError {
character: get_char_from_bytes(e, bytes),
character: e,
expected_characters: &['B', 'K', 'M', 'G', 'T', 'P', 'E', 'Z'],
also_expect_no_character: true,
})
}
#[cfg(not(feature = "u128"))]
{
Err(UnitIncorrectError {
character: get_char_from_bytes(e, bytes),
character: e,
expected_characters: &['B', 'K', 'M', 'G', 'T', 'P'],
also_expect_no_character: true,
})
Expand All @@ -332,18 +313,18 @@ pub(crate) fn read_xib(e: Option<u8>, mut bytes: Bytes) -> Result<ByteUnit, Unit
}
}

fn read_ib(mut bytes: Bytes) -> Result<bool, UnitIncorrectError> {
match bytes.next() {
fn read_ib(mut chars: Chars) -> Result<bool, UnitIncorrectError> {
match chars.next() {
Some(e) => {
match e.to_ascii_uppercase() {
b'I' => {
match bytes.next() {
'I' => {
match chars.next() {
Some(e) => {
match e.to_ascii_uppercase() {
b'B' => Ok(true),
'B' => Ok(true),
_ => {
Err(UnitIncorrectError {
character: get_char_from_bytes(e, bytes),
character: e,
expected_characters: &['B'],
also_expect_no_character: false,
})
Expand All @@ -353,11 +334,11 @@ fn read_ib(mut bytes: Bytes) -> Result<bool, UnitIncorrectError> {
None => Ok(true),
}
}
b'B' => {
match bytes.next() {
'B' => {
match chars.next() {
Some(e) => {
Err(UnitIncorrectError {
character: get_char_from_bytes(e, bytes),
character: e,
expected_characters: &[],
also_expect_no_character: false,
})
Expand All @@ -367,7 +348,7 @@ fn read_ib(mut bytes: Bytes) -> Result<bool, UnitIncorrectError> {
}
_ => {
Err(UnitIncorrectError {
character: get_char_from_bytes(e, bytes),
character: e,
expected_characters: &['B', 'i'],
also_expect_no_character: false,
})
Expand Down