Run rustfmt

[rust.git] / clippy_lints / src / doc.rs

diff --git a/clippy_lints/src/doc.rs b/clippy_lints/src/doc.rs
index 6dbf2ea959e6a667f1be86e3a52079e48a3bf570..8977ea437d141c3d78c5c3270172b31eaf044f38 100644 (file)
--- a/clippy_lints/src/doc.rs
+++ b/clippy_lints/src/doc.rs
@@ -37,7 +37,7 @@ pub struct Doc {
 
 impl Doc {
     pub fn new(valid_idents: Vec<String>) -> Self {
-        Doc { valid_idents: valid_idents }
+        Self { valid_idents: valid_idents }
     }
 }
 
@@ -62,7 +62,7 @@ struct Parser<'a> {
 }
 
 impl<'a> Parser<'a> {
-    fn new(parser: pulldown_cmark::Parser<'a>) -> Parser<'a> {
+    fn new(parser: pulldown_cmark::Parser<'a>) -> Self {
         Self { parser: parser }
     }
 }
@@ -94,13 +94,7 @@ pub fn strip_doc_comment_decoration(comment: &str, span: Span) -> (String, Vec<(
             return (
                 doc.to_owned(),
                 vec![
-                    (
-                        doc.len(),
-                        Span {
-                            lo: span.lo + BytePos(prefix.len() as u32),
-                            ..span
-                        }
-                    ),
+                    (doc.len(), span.with_lo(span.lo() + BytePos(prefix.len() as u32))),
                 ],
             );
         }
@@ -115,13 +109,7 @@ pub fn strip_doc_comment_decoration(comment: &str, span: Span) -> (String, Vec<(
             debug_assert_eq!(offset as u32 as usize, offset);
             contains_initial_stars |= line.trim_left().starts_with('*');
             // +1 for the newline
-            sizes.push((
-                line.len() + 1,
-                Span {
-                    lo: span.lo + BytePos(offset as u32),
-                    ..span
-                },
-            ));
+            sizes.push((line.len() + 1, span.with_lo(span.lo() + BytePos(offset as u32))));
         }
         if !contains_initial_stars {
             return (doc.to_string(), sizes);
@@ -228,10 +216,7 @@ fn check_doc<'a, Events: Iterator<Item = (usize, pulldown_cmark::Event<'a>)>>(
                     let (begin, span) = spans[index];
 
                     // Adjust for the begining of the current `Event`
-                    let span = Span {
-                        lo: span.lo + BytePos::from_usize(offset - begin),
-                        ..span
-                    };
+                    let span = span.with_lo(span.lo() + BytePos::from_usize(offset - begin));
 
                     check_text(cx, valid_idents, &text, span);
                 }
@@ -253,11 +238,11 @@ fn check_text(cx: &EarlyContext, valid_idents: &[String], text: &str, span: Span
 
         // Adjust for the current word
         let offset = word.as_ptr() as usize - text.as_ptr() as usize;
-        let span = Span {
-            lo: span.lo + BytePos::from_usize(offset),
-            hi: span.lo + BytePos::from_usize(offset + word.len()),
-            ..span
-        };
+        let span = Span::new(
+            span.lo() + BytePos::from_usize(offset),
+            span.lo() + BytePos::from_usize(offset + word.len()),
+            span.ctxt(),
+        );
 
         check_word(cx, word, span);
     }