Simplify markdown_input fn and subsequent logic

Urgau · Urgau · commit 7e1dc742d620 · 2024-05-04T17:52:35.000+02:00
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
@@ -3,6 +3,7 @@ use std::ffi::OsStr;
 use std::fmt;
 use std::io;
 use std::io::Read;
+use std::path::Path;
 use std::path::PathBuf;
 use std::str::FromStr;
 
@@ -816,12 +817,10 @@ impl Options {
     }
 
     /// Returns `true` if the file given as `self.input` is a Markdown file.
-    pub(crate) fn markdown_input(&self) -> bool {
+    pub(crate) fn markdown_input(&self) -> Option<&Path> {
         self.input
             .opt_path()
-            .map(std::path::Path::extension)
-            .flatten()
-            .is_some_and(|e| e == "md" || e == "markdown")
+            .filter(|p| matches!(p.extension(), Some(e) if e == "md" || e == "markdown"))
     }
 }
 
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
@@ -730,18 +730,13 @@ fn main_args(
         core::new_dcx(options.error_format, None, options.diagnostic_width, &options.unstable_opts);
 
     match (options.should_test, options.markdown_input()) {
-        (true, true) => return wrap_return(&diag, markdown::test(options)),
-        (true, false) => return doctest::run(&diag, options),
-        (false, true) => {
+        (true, Some(_)) => return wrap_return(&diag, markdown::test(options)),
+        (true, None) => return doctest::run(&diag, options),
+        (false, Some(input)) => {
+            let input = input.to_owned();
             let edition = options.edition;
             let config = core::create_config(options, &render_options, using_internal_features);
 
-            use rustc_session::config::Input;
-            let input = match &config.input {
-                Input::File(path) => path.clone(),
-                Input::Str { .. } => unreachable!("only path to markdown are supported"),
-            };
-
             // `markdown::render` can invoke `doctest::make_test`, which
             // requires session globals and a thread pool, so we use
             // `run_compiler`.
@@ -752,7 +747,7 @@ fn main_args(
                 }),
             );
         }
-        (false, false) => {}
+        (false, None) => {}
     }
 
     // need to move these items separately because we lose them by the time the closure is called,

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ use std::ffi::OsStr;`
`3`	`3`	`use std::fmt;`
`4`	`4`	`use std::io;`
`5`	`5`	`use std::io::Read;`
	`6`	`+use std::path::Path;`
`6`	`7`	`use std::path::PathBuf;`
`7`	`8`	`use std::str::FromStr;`
`8`	`9`
`@@ -816,12 +817,10 @@ impl Options {`
`816`	`817`	`}`
`817`	`818`
`818`	`819`	/// Returns `true` if the file given as `self.input` is a Markdown file.
`819`		`- pub(crate) fn markdown_input(&self) -> bool {`
	`820`	`+ pub(crate) fn markdown_input(&self) -> Option<&Path> {`
`820`	`821`	`self.input`
`821`	`822`	`.opt_path()`
`822`		`- .map(std::path::Path::extension)`
`823`		`- .flatten()`
`824`		`- .is_some_and(\|e\| e == "md" \|\| e == "markdown")`
	`823`	`+ .filter(\|p\| matches!(p.extension(), Some(e) if e == "md" \|\| e == "markdown"))`
`825`	`824`	`}`
`826`	`825`	`}`
`827`	`826`