Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate rustdoc target spec json path #125071

Merged

Conversation

GuillaumeGomez
Copy link
Member

Part of #121876.

r? @jieyouxu

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 13, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 13, 2024

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

Comment on lines 11 to 12
.arg("-L")
.arg(tmp_dir())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like

/// Add a directory to the library search path.
pub fn library_search_path<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
    self.cmd.arg("-L");
    self.cmd.arg(path.as_ref());
    self
}

introduced in #125031 for rustc. Maybe we should add it for rustdoc too?

See https://github.com/rust-lang/rust/pull/125031/files#r1598288585 for discussion.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it's convenient! Adding it to rustdoc then. :)

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! One suggestion for introducing a library_search_path helper, then r=me after CI is green.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-rustdoc-target-spec-json-path branch from 59dab66 to 8d74959 Compare May 13, 2024 13:16
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 13, 2024
@@ -137,6 +143,13 @@ impl Rustdoc {
self
}

/// Add a directory to the library search path.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also note that it corresponds to the rustdoc -L option (for a search term)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure!

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-rustdoc-target-spec-json-path branch from 8d74959 to b515de8 Compare May 13, 2024 13:21
@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 13, 2024

📌 Commit b515de8 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 13, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request May 13, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#119515 (style-guide: Format single associated type `where` clauses on the same line)
 - rust-lang#119959 ([meta] Clarify prioritization alert)
 - rust-lang#123817 (Stabilize `seek_seek_relative`)
 - rust-lang#125063 (Don't call `env::set_var` in `rustc_driver::install_ice_hook`)
 - rust-lang#125071 (Migrate rustdoc target spec json path)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ed2c2c0 into rust-lang:master May 13, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 13, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 13, 2024
Rollup merge of rust-lang#125071 - GuillaumeGomez:migrate-rustdoc-target-spec-json-path, r=jieyouxu

Migrate rustdoc target spec json path

Part of rust-lang#121876.

r? `@jieyouxu`
@GuillaumeGomez GuillaumeGomez deleted the migrate-rustdoc-target-spec-json-path branch May 14, 2024 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants