diff --git a/src/parse/import.rs b/src/parse/import.rs index dde7bbd..0d5d583 100644 --- a/src/parse/import.rs +++ b/src/parse/import.rs @@ -74,10 +74,10 @@ impl<'a> Parser<'a> { .collect::>() .into_iter() .peekmore(), - map: &mut self.map, + map: self.map, path: name.as_ref(), - scopes: &mut self.scopes, - global_scope: &mut self.global_scope, + scopes: self.scopes, + global_scope: self.global_scope, super_selectors: self.super_selectors, span_before: file.span.subspan(0, 0), content: self.content.clone(), diff --git a/src/parse/mod.rs b/src/parse/mod.rs index 9760456..997f8fd 100644 --- a/src/parse/mod.rs +++ b/src/parse/mod.rs @@ -579,7 +579,7 @@ impl<'a> Parser<'a> { map: self.map, path: self.path, scopes: self.scopes, - global_scope: &mut self.global_scope, + global_scope: self.global_scope, super_selectors: self.super_selectors, span_before: self.span_before, content: self.content.clone(), @@ -601,7 +601,7 @@ impl<'a> Parser<'a> { map: self.map, path: self.path, scopes: self.scopes, - global_scope: &mut self.global_scope, + global_scope: self.global_scope, super_selectors: self.super_selectors, span_before: self.span_before, content: self.content.clone(), @@ -826,7 +826,7 @@ impl<'a> Parser<'a> { map: self.map, path: self.path, scopes: self.scopes, - global_scope: &mut self.global_scope, + global_scope: self.global_scope, super_selectors: self.super_selectors, span_before: self.span_before, content: self.content.clone(), @@ -937,7 +937,7 @@ impl<'a> Parser<'a> { map: self.map, path: self.path, scopes: self.scopes, - global_scope: &mut self.global_scope, + global_scope: self.global_scope, super_selectors: self.super_selectors, span_before: self.span_before, content: self.content.clone(), @@ -959,7 +959,7 @@ impl<'a> Parser<'a> { map: self.map, path: self.path, scopes: self.scopes, - global_scope: &mut self.global_scope, + global_scope: self.global_scope, super_selectors: self.super_selectors, span_before: self.span_before, content: self.content.clone(), diff --git a/src/parse/value.rs b/src/parse/value.rs index 86fee64..1d3bbe9 100644 --- a/src/parse/value.rs +++ b/src/parse/value.rs @@ -786,7 +786,7 @@ impl<'a, 'b: 'a> Iterator for IntermediateValueIterator<'a, 'b> { type Item = SassResult>; fn next(&mut self) -> Option { if self.peek.is_some() { - mem::take(&mut self.peek) + self.peek.take() } else { self.parser.parse_intermediate_value() }