alex/valence
1
0
Fork 0
mirror of https://github.com/italicsjenga/valence.git synced 2024-12-24 06:51:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Remove dbg! calls and make some tweaks to Ident

Browse source
This commit is contained in:
Ryan 2022-10-11 14:05:00 -07:00
parent e30ed62240
commit afe390836c
1 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/ident.rs
View file

@ -28,12 +28,8 @@ use crate::protocol::{Decode, Encode};
#[derive(Clone, Eq)] #[derive(Clone, Eq)]
pub struct Ident<'a> { pub struct Ident<'a> {
string: Cow<'a, AsciiStr>, string: Cow<'a, AsciiStr>,
/// The index of the ':' character in the string. /// The index of the first character of the path part in the string.
/// If there is no namespace then it is `usize::MAX`. path_start: usize,
///
/// Since the string only contains ASCII characters, we can slice it
/// in O(1) time.
colon_idx: usize,
} }
/// The error type created when an [`Ident`] cannot be parsed from a /// The error type created when an [`Ident`] cannot be parsed from a
@ -79,12 +75,12 @@ impl<'a> Ident<'a> {
{ {
Ok(Self { Ok(Self {
string: cow, string: cow,
colon_idx, path_start: colon_idx + 1,
}) })
} }
None if check_path(str) => Ok(Self { None if check_path(str) => Ok(Self {
string: cow, string: cow,
colon_idx: usize::MAX, path_start: 0,
}), }),
_ => Err(IdentParseError(ascii_cow_to_str_cow(cow))), _ => Err(IdentParseError(ascii_cow_to_str_cow(cow))),
} }
@ -95,20 +91,16 @@ impl<'a> Ident<'a> {
/// If this identifier was constructed from a string without a namespace, /// If this identifier was constructed from a string without a namespace,
/// then "minecraft" is returned. /// then "minecraft" is returned.
pub fn namespace(&self) -> &str { pub fn namespace(&self) -> &str {
if self.colon_idx != usize::MAX { if self.path_start == 0 {
self.string[..self.colon_idx].as_str()
} else {
"minecraft" "minecraft"
} else {
self.string[..self.path_start - 1].as_str()
} }
} }
/// Returns the path part of this resource identifier. /// Returns the path part of this resource identifier.
pub fn path(&self) -> &str { pub fn path(&self) -> &str {
if self.colon_idx == usize::MAX { self.string[self.path_start..].as_str()
self.string.as_str()
} else {
self.string[self.colon_idx + 1..].as_str()
}
} }
/// Returns the underlying string as a `str`. /// Returns the underlying string as a `str`.
@ -160,7 +152,7 @@ impl<'a> From<Ident<'a>> for String {
impl<'a> From<Ident<'a>> for Cow<'a, str> { impl<'a> From<Ident<'a>> for Cow<'a, str> {
fn from(id: Ident<'a>) -> Self { fn from(id: Ident<'a>) -> Self {
ascii_cow_to_str_cow(id.string) id.into_inner()
} }
} }
@ -253,8 +245,6 @@ impl<'de> Visitor<'de> for IdentVisitor {
} }
fn visit_str<E: de::Error>(self, s: &str) -> Result<Self::Value, E> { fn visit_str<E: de::Error>(self, s: &str) -> Result<Self::Value, E> {
dbg!("foo");
Ident::from_str(s).map_err(E::custom) Ident::from_str(s).map_err(E::custom)
} }
@ -262,14 +252,10 @@ impl<'de> Visitor<'de> for IdentVisitor {
where where
E: de::Error, E: de::Error,
{ {
dbg!("bar");
Ident::new(v).map_err(E::custom) Ident::new(v).map_err(E::custom)
} }
fn visit_string<E: de::Error>(self, s: String) -> Result<Self::Value, E> { fn visit_string<E: de::Error>(self, s: String) -> Result<Self::Value, E> {
dbg!("baz");
Ident::new(s).map_err(E::custom) Ident::new(s).map_err(E::custom)
} }
} }
@ -313,6 +299,13 @@ mod tests {
use super::*; use super::*;
#[test]
fn check_namespace_and_path() {
let id = ident!("namespace:path");
assert_eq!(id.namespace(), "namespace");
assert_eq!(id.path(), "path");
}
#[test] #[test]
fn parse_valid() { fn parse_valid() {
ident!("minecraft:whatever"); ident!("minecraft:whatever");
@ -366,7 +359,7 @@ mod tests {
} }
#[test] #[test]
fn visit_borrowed_str_works() { fn visit_borrowed_str_borrows() {
let data = String::from("valence:frobnicator"); let data = String::from("valence:frobnicator");
check_borrowed( check_borrowed(