WIP: remove unused arg

Author: lolbinarycat

src/librustdoc/passes/lint/html_tags.rs

@@ -145,7 +145,7 @@ pub(crate) fn visit_item(cx: &DocContext<'_>, item: &Item, hir_id: HirId, dox: &
         match event {
             Event::Start(Tag::CodeBlock(_)) => in_code_block = true,
             Event::Html(text) | Event::InlineHtml(text) if !in_code_block => {
-                tagp.extract_tags(&text, range, dox, &mut is_in_comment, &report_diag)
+                tagp.extract_tags(&text, range, &mut is_in_comment, &report_diag)
             }
             Event::End(TagEnd::CodeBlock) => in_code_block = false,
             _ => {}
@@ -167,7 +167,7 @@ pub(crate) fn visit_item(cx: &DocContext<'_>, item: &Item, hir_id: HirId, dox: &
         }
         for (tag, range) in tagp.tags.iter().filter(|(t, range)| {
             let t = t.to_lowercase();
-            !is_implicitly_self_closing(&t, range.clone(), dox)
+            !is_implicitly_self_closing(&t)
         }) {
             report_diag(format!("unclosed HTML tag `{tag}`"), range, true);
         }
@@ -182,7 +182,7 @@ const ALLOWED_UNCLOSED: &[&str] = &[
 ];
 
 /// Allows constructs like `<img>`, but not `<img`.
-fn is_implicitly_self_closing(tag_name: &str, _range: Range<usize>, _dox: &str) -> bool {
+fn is_implicitly_self_closing(tag_name: &str) -> bool {
     ALLOWED_UNCLOSED.contains(&tag_name)
 }
 
@@ -283,7 +283,6 @@ impl TagParser {
     fn drop_tag(
         &mut self,
         range: Range<usize>,
-        dox: &str,
         f: &impl Fn(String, &Range<usize>, bool),
     ) {
         let tag_name_low = self.tag_name.to_lowercase();
@@ -299,7 +298,7 @@ impl TagParser {
                     continue;
                 }
                 let last_tag_name_low = last_tag_name.to_lowercase();
-                if is_implicitly_self_closing(&last_tag_name_low, last_tag_span.clone(), dox) {
+                if is_implicitly_self_closing(&last_tag_name_low) {
                     continue;
                 }
                 // `tags` is used as a queue, meaning that everything after `pos` is included inside it.
@@ -334,7 +333,6 @@ impl TagParser {
         &mut self,
         text: &str,
         range: &Range<usize>,
-        dox: &str,
         start_pos: usize,
         iter: &mut Peekable<CharIndices<'_>>,
         f: &impl Fn(String, &Range<usize>, bool),
@@ -388,7 +386,7 @@ impl TagParser {
                                 break 'outer_loop;
                             }
                         }
-                        self.drop_tag(r, dox, f);
+                        self.drop_tag(r, f);
                         self.tag_parsed();
                     } else {
                         self.extract_opening_tag(text, range, r, pos, c, iter, f)
@@ -477,7 +475,6 @@ impl TagParser {
         &mut self,
         text: &str,
         range: Range<usize>,
-        dox: &str,
         is_in_comment: &mut Option<Range<usize>>,
         f: &impl Fn(String, &Range<usize>, bool),
     ) {
@@ -490,7 +487,7 @@ impl TagParser {
             if self.in_attrs &&
                 let Some(&(start_pos, _)) = iter.peek()
             {
-                self.extract_html_tag(text, &range, dox, start_pos, &mut iter, f);
+                self.extract_html_tag(text, &range, start_pos, &mut iter, f);
                 // if no progress is being made, move forward forcefully.
                 if prev_pos == start_pos {
                     iter.next();
@@ -524,11 +521,11 @@ impl TagParser {
                         self.tag_parsed();
 
                     }*/
-                    self.extract_html_tag(text, &range, dox, start_pos, &mut iter, f);
+                    self.extract_html_tag(text, &range, start_pos, &mut iter, f);
                 }
             } else if !self.tag_name.is_empty() {
                 // partially inside html tag that spans across events
-                self.extract_html_tag(text, &range, dox, start_pos, &mut iter, f);
+                self.extract_html_tag(text, &range,  start_pos, &mut iter, f);
             } 
         }
     }
@@ -544,7 +541,7 @@ fn test_extract_tags_nested_unclosed() {
     let mut tagp = TagParser::new();
     let mut diags = RefCell::new(Vec::new());
     let dox = "<div>\n<br</div>";
-    tagp.extract_tags(dox, 0..dox.len(), dox, &mut None, &|s, r, b| {
+    tagp.extract_tags(dox, 0..dox.len(), &mut None, &|s, r, b| {
         diags.borrow_mut().push((s, r.clone(), b));
     });
     assert_eq!(diags.borrow().len(), 1, "did not get expected diagnostics: {diags:?}");
@@ -558,7 +555,7 @@ fn test_extract_tags_taglike_in_attr() {
     let mut tagp = TagParser::new();
     let mut diags = RefCell::new(Vec::new());
     let dox = "<img src='<div>'>";
-    tagp.extract_tags(dox, 0..dox.len(), dox, &mut None, &|s, r, b| {
+    tagp.extract_tags(dox, 0..dox.len(), &mut None, &|s, r, b| {
         diags.borrow_mut().push((s, r.clone(), b));
     });
     assert_eq!(diags.borrow().len(), 0, "unexpected diagnostics: {diags:?}");
@@ -571,8 +568,22 @@ fn test_extract_tags_taglike_in_multiline_attr() {
     let mut tagp = TagParser::new();
     let mut diags = RefCell::new(Vec::new());
     let dox = "<img src=\"\nasd\n<div>\n\">";
-    tagp.extract_tags(dox, 0..dox.len(), dox, &mut None, &|s, r, b| {
+    tagp.extract_tags(dox, 0..dox.len(), &mut None, &|s, r, b| {
         diags.borrow_mut().push((s, r.clone(), b));
     });
     assert_eq!(diags.borrow().len(), 0, "unexpected diagnostics: {diags:?}");
 }
+
+/*#[test]
+fn test_extract_tags_taglike_in_multievent_attr() {
+    use std::cell::RefCell;
+
+    let mut tagp = TagParser::new();
+    let mut diags = RefCell::new(Vec::new());
+    let dox = "<img src='<div>'>";
+    let split_point = 10;
+    tagp.extract_tags(dox, 0..dox.len(), &mut None, &|s, r, b| {
+        diags.borrow_mut().push((s, r.clone(), b));
+    });
+    assert_eq!(diags.borrow().len(), 0, "unexpected diagnostics: {diags:?}");
+}*/