user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #146161 - GuillaumeGomez:loaded-paths-scraped-examples, r=lolbinarycat

Browse source 
[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
This commit is contained in:
Stuart Cook 2025-09-04 10:02:06 +10:00 • committed by GitHub
commit c81fffa9a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustdoc/config.rs
View file

@ -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 =

7
src/librustdoc/scrape_examples.rs
View file

@ -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}")),