diff --git a/src/lib.rs b/src/lib.rs index 1e4ab4d..291e86c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -261,7 +261,7 @@ impl StyleSheet { /// ``` #[inline] #[cfg(not(feature = "wasm"))] - pub fn from_path + Into + Clone>(p: P) -> SassResult { + pub fn from_path + Into + Clone>(p: &P) -> SassResult { let mut map = CodeMap::new(); let file = map.add_file(p.clone().into(), String::from_utf8(fs::read(p.clone())?)?); Css::from_stylesheet(StyleSheet( @@ -436,10 +436,7 @@ impl<'a> StyleSheetParser<'a> { c if c.is_control() => { return Err(("expected selector.", self.lexer.next().unwrap().pos()).into()); } - _ => match dbg!(self.lexer.next()) { - Some(..) => todo!("unexpected toplevel token"), - _ => unsafe { std::hint::unreachable_unchecked() }, - } + _ => todo!("unexpected toplevel token: {:?}", kind), }; } Ok((rules, GLOBAL_SCOPE.with(|s| s.borrow().clone()))) diff --git a/src/main.rs b/src/main.rs index b176032..97a70a3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -66,7 +66,7 @@ fn main() { for name in inputs { stdout .write_all( - StyleSheet::from_path(name) + StyleSheet::from_path(&name) .unwrap_or_else(|e| { eprintln!("{}", e); std::process::exit(1) diff --git a/src/selector/attribute.rs b/src/selector/attribute.rs index f9f356f..47d5f1a 100644 --- a/src/selector/attribute.rs +++ b/src/selector/attribute.rs @@ -48,9 +48,10 @@ fn attribute_name>( toks.next(); if toks.peek().ok_or(("expected \"|\".", pos))?.kind != '|' { return Err(("expected \"|\".", pos).into()); - } else { - toks.next(); } + + toks.next(); + let ident = eat_ident(toks, scope, super_selector)?.node; return Ok(QualifiedName { ident, @@ -161,10 +162,10 @@ impl Attribute { if toks.peek().ok_or(("expected \"]\".", pos))?.kind != ']' { return Err(("expected \"]\".", pos).into()); - } else { - toks.next(); } + toks.next(); + Ok(SelectorKind::Attribute(Attribute { op, attr, diff --git a/src/value/parse.rs b/src/value/parse.rs index 0aa1bc6..ea66c58 100644 --- a/src/value/parse.rs +++ b/src/value/parse.rs @@ -829,10 +829,7 @@ impl Value { } ':' | '?' | ')' => Err(("expected \";\".", span).into()), v if v.is_control() => Err(("Expected expression.", span).into()), - v => { - dbg!(v); - panic!("Unexpected token in value parsing") - } + v => todo!("unexpected token in value parsing: {:?}", v), } } } diff --git a/tests/imports.rs b/tests/imports.rs index 0db9fc5..634d188 100644 --- a/tests/imports.rs +++ b/tests/imports.rs @@ -26,12 +26,12 @@ macro_rules! tempfile { .suffix($dir) .tempdir_in("") .unwrap(); - let mut f = dbg!(Builder::new() + let mut f = Builder::new() .rand_bytes(0) .prefix("") .suffix($name) .tempfile_in($dir) - .unwrap()); + .unwrap(); write!(f, "{}", $content).unwrap(); }; }