diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-09-04 10:02:06 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-04 10:02:06 +1000 |
| commit | c81fffa9a36cbebb72379a5fa69c753d5b77c271 (patch) | |
| tree | 3ebc84050340c347cc7e5054e22f562fc8c82d68 | |
| parent | 8b2a64f0c7b0fe8431542cce8101ee57b9fa7cda (diff) | |
| parent | a5f52a9a90c97cf7e0c1b5f4777eb33df159a75f (diff) | |
| download | rust-c81fffa9a36cbebb72379a5fa69c753d5b77c271.tar.gz rust-c81fffa9a36cbebb72379a5fa69c753d5b77c271.zip | |
Rollup merge of #146161 - GuillaumeGomez:loaded-paths-scraped-examples, r=lolbinarycat
[rustdoc] Uncomment code to add scraped rustdoc examples in loaded paths Since the bug was fixed in https://github.com/rust-lang/rust/pull/146091, we can now uncomment the code. :) r? lolbinarycat
| -rw-r--r-- | src/librustdoc/config.rs | 3 | ||||
| -rw-r--r-- | src/librustdoc/scrape_examples.rs | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs index 1220a05e458..d7f6fa347be 100644 --- a/src/librustdoc/config.rs +++ b/src/librustdoc/config.rs @@ -821,7 +821,8 @@ impl Options { let scrape_examples_options = ScrapeExamplesOptions::new(matches, dcx); let with_examples = matches.opt_strs("with-examples"); - let call_locations = crate::scrape_examples::load_call_locations(with_examples, dcx); + let call_locations = + crate::scrape_examples::load_call_locations(with_examples, dcx, &mut loaded_paths); let doctest_build_args = matches.opt_strs("doctest-build-arg"); let unstable_features = diff --git a/src/librustdoc/scrape_examples.rs b/src/librustdoc/scrape_examples.rs index 16034c11827..471e966e2c2 100644 --- a/src/librustdoc/scrape_examples.rs +++ b/src/librustdoc/scrape_examples.rs @@ -333,14 +333,11 @@ pub(crate) fn run( pub(crate) fn load_call_locations( with_examples: Vec<String>, dcx: DiagCtxtHandle<'_>, + loaded_paths: &mut Vec<PathBuf>, ) -> AllCallLocations { let mut all_calls: AllCallLocations = FxIndexMap::default(); for path in with_examples { - // FIXME: Figure out why this line is causing this feature to crash in specific contexts. - // Full issue backlog is available here: <https://github.com/rust-lang/rust/pull/144600>. - // - // Can be checked with `tests/run-make/rustdoc-scrape-examples-paths`. - // loaded_paths.push(path.clone().into()); + loaded_paths.push(path.clone().into()); let bytes = match fs::read(&path) { Ok(bytes) => bytes, Err(e) => dcx.fatal(format!("failed to load examples: {e}")), |