Skip to content

Commit

Permalink
Unrolled build for rust-lang#125639
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#125639 - ChrisDenton:run-make-support-doc, r=onur-ozkan

Support `./x doc run-make-support --open`

Having easy access to the run-make-support documentation is invaluable when creating run-make tests using the new Rust recipes.
  • Loading branch information
rust-timer committed May 29, 2024
2 parents da159eb + ef9e6ca commit 457b596
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 3 deletions.
8 changes: 8 additions & 0 deletions src/bootstrap/src/core/build_steps/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1028,6 +1028,14 @@ tool_doc!(
is_library = true,
crates = ["bootstrap"]
);
tool_doc!(
RunMakeSupport,
"run_make_support",
"src/tools/run-make-support",
rustc_tool = false,
is_library = true,
crates = ["run_make_support"]
);

#[derive(Ord, PartialOrd, Debug, Clone, Hash, PartialEq, Eq)]
pub struct ErrorIndex {
Expand Down
1 change: 1 addition & 0 deletions src/bootstrap/src/core/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -888,6 +888,7 @@ impl<'a> Builder<'a> {
doc::Tidy,
doc::Bootstrap,
doc::Releases,
doc::RunMakeSupport,
),
Kind::Dist => describe!(
dist::Docs,
Expand Down
2 changes: 1 addition & 1 deletion src/tools/run-make-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ macro_rules! impl_common_helpers {
self
}

/// Inspect what the underlying [`Command`][::std::process::Command] is up to the
/// Inspect what the underlying [`Command`] is up to the
/// current construction.
pub fn inspect<I>(&mut self, inspector: I) -> &mut Self
where
Expand Down
2 changes: 1 addition & 1 deletion src/tools/run-make-support/src/rustc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ impl Rustc {
self
}

/// Get the [`Output`][::std::process::Output] of the finished process.
/// Get the [`Output`] of the finished process.
#[track_caller]
pub fn command_output(&mut self) -> ::std::process::Output {
// let's make sure we piped all the input and outputs
Expand Down
2 changes: 1 addition & 1 deletion src/tools/run-make-support/src/rustdoc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ impl Rustdoc {
self
}

/// Get the [`Output`][::std::process::Output] of the finished process.
/// Get the [`Output`] of the finished process.
#[track_caller]
pub fn command_output(&mut self) -> ::std::process::Output {
// let's make sure we piped all the input and outputs
Expand Down

0 comments on commit 457b596

Please sign in to comment.