avoid wrapping and unwrapping MaybeSpanned

Author: oli-obk

src/lib.rs

@@ -878,13 +878,7 @@ fn run_rustfix(
             stdout: stdout.into(),
         })?;
 
-    let edition = comments.edition(revision, &config.comment_defaults)?;
-    let edition = edition
-        .map(|mwl| {
-            let line = mwl.span().unwrap_or_default();
-            Spanned::new(mwl.into_inner(), line)
-        })
-        .into();
+    let edition = comments.edition(revision, &config.comment_defaults)?.into();
     let rustfix_comments = Comments {
         revisions: None,
         revisioned: std::iter::once((

src/parser.rs

@@ -92,15 +92,12 @@ impl Comments {
         &self,
         revision: &str,
         default: &Self,
-    ) -> Result<Option<MaybeSpanned<String>>, Errored> {
+    ) -> Result<Option<Spanned<String>>, Errored> {
         let edition =
             self.find_one_for_revision(revision, "`edition` annotations", |r| r.edition.clone())?;
         let default = default
             .find_one_for_revision(revision, "`edition` annotations", |r| r.edition.clone())?;
-        let edition = edition
-            .into_inner()
-            .or(default.into_inner())
-            .map(MaybeSpanned::from);
+        let edition = edition.into_inner().or(default.into_inner());
         Ok(edition)
     }
 

src/parser/spanned.rs

@@ -23,10 +23,6 @@ impl<T> MaybeSpanned<T> {
     pub fn span(&self) -> Option<Span> {
         self.span.clone()
     }
-
-    pub fn into_inner(self) -> T {
-        self.data
-    }
 }
 
 impl<T> From<Spanned<T>> for MaybeSpanned<T> {