Migrate rustdoc target spec json path#125071
Merged
bors merged 3 commits intorust-lang:masterfrom May 13, 2024
Merged
Conversation
Collaborator
jieyouxu
reviewed
May 13, 2024
Comment on lines
11
to
12
| .arg("-L") | ||
| .arg(tmp_dir()) |
Member
There was a problem hiding this comment.
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.
Member
Author
There was a problem hiding this comment.
Oh, it's convenient! Adding it to rustdoc then. :)
jieyouxu
approved these changes
May 13, 2024
Member
jieyouxu
left a comment
There was a problem hiding this comment.
Thanks! One suggestion for introducing a library_search_path helper, then r=me after CI is green.
This comment has been minimized.
This comment has been minimized.
59dab66 to
8d74959
Compare
jieyouxu
reviewed
May 13, 2024
| self | ||
| } | ||
|
|
||
| /// Add a directory to the library search path. |
Member
There was a problem hiding this comment.
Can you also note that it corresponds to the rustdoc -L option (for a search term)?
8d74959 to
b515de8
Compare
Member
|
@bors r+ rollup |
Collaborator
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
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`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #121876.
r? @jieyouxu