refactor

Sebastian Thiel committed 4 years ago

Commit 957356b1 parent 1bdf2e13 files · +22 −16Browse files

Unified · Split

3 files

 /// The state an attribute can be in, referencing the value.
 ///
 /// Note that this doesn't contain the name.
-#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
+#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
 pub enum StateRef<'a> {
     /// The attribute is listed, or has the special value 'true'
     Unset,
     /// The attribute is set to the given value, which followed the `=` sign.
     /// Note that values can be empty.
-    Value(CompactString),
+    Value(CompactString), // TODO: use `kstring`, maybe it gets a binary string soon
     /// The attribute isn't mentioned with a given path or is explicitly set to `Unspecified` using the `!` sign.
     Unspecified,
 }
     pub sequence_number: usize,
 }
+mod state {
+    use crate::{State, StateRef};
+    use bstr::ByteSlice;
+    impl<'a> From<StateRef<'a>> for State {
+        fn from(s: StateRef<'a>) -> Self {
+            match s {
+                StateRef::Value(v) => State::Value(v.to_str().expect("no illformed unicode").into()),
+                StateRef::Set => State::Set,
+                StateRef::Unset => State::Unset,
+                StateRef::Unspecified => State::Unspecified,
+            }
+        }
+    }
+}
 pub mod name {
     use bstr::BString;

@@ -6,17 +6,6 @@ use std::{ · 5 unmodified lines
6	path::{Path, PathBuf},	6	path::{Path, PathBuf},
7	};	7	};
8		8
9	impl<'a> From<StateRef<'a>> for State {
10	fn from(s: StateRef<'a>) -> Self {
11	match s {
12	StateRef::Value(v) => State::Value(v.to_str().expect("no illformed unicode").into()),
13	StateRef::Set => State::Set,
14	StateRef::Unset => State::Unset,
15	StateRef::Unspecified => State::Unspecified,
16	}
17	}
18	}
19
20	fn attrs_to_assignments<'a>(	9	fn attrs_to_assignments<'a>(
21	attrs: impl Iterator<Item = Result<crate::NameRef<'a>, crate::name::Error>>,	10	attrs: impl Iterator<Item = Result<crate::NameRef<'a>, crate::name::Error>>,
22	) -> Result<Vec<Assignment>, crate::name::Error> {	11	) -> Result<Vec<Assignment>, crate::name::Error> {

     }
     pub fn state(&self) -> StateRef<'a> {
-        self.1.clone()
+        self.1
     }
 }
 }
 impl Name {
-    pub fn name(&self) -> &BString {
+    pub fn name(&self) -> &BStr {
-        &self.0
+        self.0.as_bstr()
     }
     pub fn state(&self) -> &State {
+        // TODO: StateRef<'_>
         &self.1
     }
 }