Clippy

Author: kornelski

src/html/text_type.rs

@@ -56,6 +56,7 @@ cfg_if! {
         }
 
         impl<'s> From<&'s str> for TextType {
+            #[allow(clippy::fallible_impl_from)]
             fn from(text_type: &'s str) -> Self {
                 match text_type {
                     "Data state" => Self::Data,

src/parser/lexer/conditions.rs

@@ -1,4 +1,4 @@
-use super::*;
+use super::{LexemeSink, Lexer, TagTokenOutline};
 use crate::parser::state_machine::StateMachineConditions;
 
 impl<S: LexemeSink> StateMachineConditions for Lexer<S> {

src/parser/tag_scanner/conditions.rs

@@ -1,4 +1,4 @@
-use super::*;
+use super::{TagHintSink, TagScanner};
 use crate::parser::state_machine::StateMachineConditions;
 
 impl<S: TagHintSink> StateMachineConditions for TagScanner<S> {

src/parser/tag_scanner/mod.rs

@@ -134,12 +134,11 @@ impl<S: TagHintSink> TagScanner<S> {
     fn take_feedback_directive(&mut self) -> FeedbackDirective {
         self.pending_text_type_change
             .take()
-            .map(|text_type| {
+            .map_or(FeedbackDirective::Skip, |text_type| {
                 FeedbackDirective::ApplyUnhandledFeedback(TreeBuilderFeedback::SwitchTextType(
                     text_type,
                 ))
             })
-            .unwrap_or(FeedbackDirective::Skip)
     }
 }
 

src/rewritable_units/text_encoder.rs

@@ -142,16 +142,16 @@ impl Buffer {
 
     fn buffer_for_length(&mut self, content_len: usize) -> &mut [u8] {
         let buffer = match self {
-            Buffer::Heap(buf) => buf.as_mut_slice(),
+            Self::Heap(buf) => buf.as_mut_slice(),
             // Long non-ASCII content could take lots of roundtrips through the encoder
             buf if content_len >= Self::CONTENT_WRITE_LENGTH_LONG_ENOUGH_TO_USE_LARGER_BUFFER => {
-                *buf = Buffer::Heap(vec![0; Self::DEFAULT_HEAP_BUFFER_SIZE]);
+                *buf = Self::Heap(vec![0; Self::DEFAULT_HEAP_BUFFER_SIZE]);
                 match buf {
-                    Buffer::Heap(buf) => buf.as_mut(),
+                    Self::Heap(buf) => buf.as_mut(),
                     _ => unreachable!(),
                 }
             }
-            Buffer::Stack(buf) => buf.as_mut_slice(),
+            Self::Stack(buf) => buf.as_mut_slice(),
         };
         buffer
     }

src/rewritable_units/tokens/start_tag.rs

@@ -24,7 +24,7 @@ pub struct StartTag<'i> {
 impl<'i> StartTag<'i> {
     #[inline]
     #[must_use]
-    pub(super) fn new_token(
+    pub(super) const fn new_token(
         name: Bytes<'i>,
         attributes: Attributes<'i>,
         ns: Namespace,
@@ -117,6 +117,9 @@ impl<'i> StartTag<'i> {
         self.self_closing
     }
 
+    /// If false, the tag won't be seiralized with `/>`
+    ///
+    /// This doesn't affect content model
     pub(crate) fn set_self_closing_syntax(&mut self, has_slash: bool) {
         self.self_closing = has_slash;
     }

src/rewriter/handlers_dispatcher.rs

@@ -185,7 +185,7 @@ impl<'h, H: HandlerTypes> ContentHandlersDispatcher<'h, H> {
     }
 
     #[inline]
-    pub fn start_matching(&mut self, match_info: MatchInfo<SelectorHandlersLocator>) {
+    pub fn start_matching(&mut self, match_info: &MatchInfo<SelectorHandlersLocator>) {
         let locator = match_info.payload;
 
         if match_info.with_content {

src/rewriter/mod.rs

@@ -5,7 +5,7 @@ mod rewrite_controller;
 pub(crate) mod settings;
 
 use self::handlers_dispatcher::ContentHandlersDispatcher;
-use self::rewrite_controller::*;
+use self::rewrite_controller::{ElementDescriptor, HtmlRewriteController};
 pub use self::settings::*;
 use crate::base::SharedEncoding;
 use crate::memory::{MemoryLimitExceededError, SharedMemoryLimiter};

src/rewriter/rewrite_controller.rs

@@ -3,7 +3,7 @@ use super::{HandlerTypes, RewritingError};
 use crate::html::{LocalName, Namespace};
 use crate::rewritable_units::{DocumentEnd, Token, TokenCaptureFlags};
 use crate::selectors_vm::{AuxStartTagInfoRequest, ElementData, SelectorMatchingVm, VmError};
-use crate::transform_stream::*;
+use crate::transform_stream::{DispatcherError, StartTagHandlingResult, TransformController};
 use hashbrown::HashSet;
 
 #[derive(Default)]
@@ -48,7 +48,7 @@ impl<H: HandlerTypes> HtmlRewriteController<'_, H> {
         Err(DispatcherError::InfoRequest(Box::new(
             move |this, aux_info| {
                 if let Some(ref mut vm) = this.selector_matching_vm {
-                    let mut match_handler = |m| this.handlers_dispatcher.start_matching(m);
+                    let mut match_handler = |m| this.handlers_dispatcher.start_matching(&m);
 
                     aux_info_req(vm, aux_info, &mut match_handler)
                         .map_err(RewritingError::MemoryLimitExceeded)?;
@@ -78,7 +78,7 @@ impl<H: HandlerTypes> TransformController for HtmlRewriteController<'_, H> {
     ) -> StartTagHandlingResult<Self> {
         match self.selector_matching_vm {
             Some(ref mut vm) => {
-                let mut match_handler = |m| self.handlers_dispatcher.start_matching(m);
+                let mut match_handler = |m| self.handlers_dispatcher.start_matching(&m);
 
                 match vm.exec_for_start_tag(local_name, ns, &mut match_handler) {
                     Ok(()) => Ok(self.get_capture_flags()),

src/selectors_vm/ast.rs

@@ -128,10 +128,10 @@ impl From<&Component<SelectorImplDescriptor>> for Condition {
                 Self::OnTagName(OnTagNameExpr::ExplicitAny)
             }
             Component::ExplicitNoNamespace => Self::OnTagName(OnTagNameExpr::Unmatchable),
-            Component::ID(id) => Self::OnAttributes(OnAttributesExpr::Id(id.0.to_owned())),
-            Component::Class(c) => Self::OnAttributes(OnAttributesExpr::Class(c.0.to_owned())),
+            Component::ID(id) => Self::OnAttributes(OnAttributesExpr::Id(id.0.clone())),
+            Component::Class(c) => Self::OnAttributes(OnAttributesExpr::Class(c.0.clone())),
             Component::AttributeInNoNamespaceExists { local_name, .. } => {
-                Self::OnAttributes(OnAttributesExpr::AttributeExists(local_name.0.to_owned()))
+                Self::OnAttributes(OnAttributesExpr::AttributeExists(local_name.0.clone()))
             }
             &Component::AttributeInNoNamespace {
                 ref local_name,
@@ -145,8 +145,8 @@ impl From<&Component<SelectorImplDescriptor>> for Condition {
                 } else {
                     Self::OnAttributes(OnAttributesExpr::AttributeComparisonExpr(
                         AttributeComparisonExpr::new(
-                            local_name.0.to_owned(),
-                            value.0.to_owned(),
+                            local_name.0.clone(),
+                            value.0.clone(),
                             case_sensitivity,
                             operator,
                         ),