diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-03-01 16:03:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-01 16:03:12 +0100 |
| commit | 643c19c1601c487ed1daf6212780afec744d97a7 (patch) | |
| tree | 51c9b76a77258f812bd828b34cd9b8524f2f85c3 | |
| parent | 3bf976542a68e0d32e54bbf0b6c5081c5993b4fd (diff) | |
| parent | c86a7ef793b2186e15a74ab37b642f8859fec0f3 (diff) | |
| download | rust-643c19c1601c487ed1daf6212780afec744d97a7.tar.gz rust-643c19c1601c487ed1daf6212780afec744d97a7.zip | |
Rollup merge of #137807 - GuillaumeGomez:doctest-qualify-result, r=notriddle
Fully qualify `Result` in generated doctest code As discussed in https://lore.kernel.org/rust-for-linux/20250228132553.880126-1-guillaume1.gomez@gmail.com/T/#u, it would require less code for RfL to be able to reach the same result (pun unintended). cc ``@ojeda`` r? ``@notriddle``
| -rw-r--r-- | src/librustdoc/doctest/make.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/doctest/tests.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustdoc/doctest/make.rs b/src/librustdoc/doctest/make.rs index 4792bc525a5..9935074877b 100644 --- a/src/librustdoc/doctest/make.rs +++ b/src/librustdoc/doctest/make.rs @@ -208,7 +208,7 @@ impl DocTestBuilder { let (main_pre, main_post) = if returns_result { ( format!( - "fn main() {{ {inner_attr}fn {inner_fn_name}() -> Result<(), impl core::fmt::Debug> {{\n", + "fn main() {{ {inner_attr}fn {inner_fn_name}() -> core::result::Result<(), impl core::fmt::Debug> {{\n", ), format!("\n}} {inner_fn_name}().unwrap() }}"), ) diff --git a/src/librustdoc/doctest/tests.rs b/src/librustdoc/doctest/tests.rs index fa6cca3681b..e2b964bf5af 100644 --- a/src/librustdoc/doctest/tests.rs +++ b/src/librustdoc/doctest/tests.rs @@ -316,7 +316,7 @@ let mut input = String::new(); io::stdin().read_line(&mut input)?; Ok::<(), io:Error>(())"; let expected = "#![allow(unused)] -fn main() { fn _inner() -> Result<(), impl core::fmt::Debug> { +fn main() { fn _inner() -> core::result::Result<(), impl core::fmt::Debug> { use std::io; let mut input = String::new(); io::stdin().read_line(&mut input)?; |
