Skip to content

Commit dfd52ba

Browse files
committed
Auto merge of #59772 - andrehjr:add-rustc-guide-to-toolstate, r=mark-i-m
Add rustc guide to toolstate Closes #59597
2 parents 254f201 + b5cd962 commit dfd52ba

File tree

14 files changed

+450
-29
lines changed

14 files changed

+450
-29
lines changed

Cargo.lock

Lines changed: 360 additions & 27 deletions
Large diffs are not rendered by default.

src/bootstrap/builder.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ impl<'a> Builder<'a> {
405405
test::TheBook,
406406
test::UnstableBook,
407407
test::RustcBook,
408+
test::RustcGuide,
408409
test::EmbeddedBook,
409410
test::EditionGuide,
410411
test::Rustfmt,

src/bootstrap/test.rs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,6 +1530,31 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
15301530
}
15311531
}
15321532

1533+
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
1534+
pub struct RustcGuide;
1535+
1536+
impl Step for RustcGuide {
1537+
type Output = ();
1538+
const DEFAULT: bool = false;
1539+
const ONLY_HOSTS: bool = true;
1540+
1541+
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
1542+
run.path("src/doc/rustc-guide")
1543+
}
1544+
1545+
fn make_run(run: RunConfig<'_>) {
1546+
run.builder.ensure(RustcGuide);
1547+
}
1548+
1549+
fn run(self, builder: &Builder<'_>) {
1550+
let src = builder.src.join("src/doc/rustc-guide");
1551+
let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
1552+
builder.run(rustbook_cmd
1553+
.arg("linkcheck")
1554+
.arg(&src));
1555+
}
1556+
}
1557+
15331558
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
15341559
pub struct CrateLibrustc {
15351560
compiler: Compiler,

src/ci/docker/test-various/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
libssl-dev \
15+
pkg-config \
1416
xz-utils \
1517
wget \
1618
patch

src/ci/docker/x86_64-gnu-debug/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
cmake \
1818
sudo \
1919
gdb \
20+
libssl-dev \
21+
pkg-config \
2022
xz-utils \
2123
lld \
2224
clang

src/ci/docker/x86_64-gnu-full-bootstrap/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
libssl-dev \
15+
pkg-config \
1416
xz-utils
1517

1618
COPY scripts/sccache.sh /scripts/

src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
gdb \
1414
llvm-6.0-tools \
1515
libedit-dev \
16+
libssl-dev \
17+
pkg-config \
1618
zlib1g-dev \
1719
xz-utils
1820

src/ci/docker/x86_64-gnu-nopt/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
libssl-dev \
15+
pkg-config \
1416
xz-utils
1517

1618
COPY scripts/sccache.sh /scripts/

src/ci/docker/x86_64-gnu-tools/checktools.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ status_check() {
8888
# these tools are not required for beta to successfully branch
8989
check_dispatch $1 nightly miri src/tools/miri
9090
check_dispatch $1 nightly embedded-book src/doc/embedded-book
91+
check_dispatch $1 nightly rustc-guide src/doc/rustc-guide
9192
}
9293

9394
# If this PR is intended to update one of these tools, do not let the build pass

src/ci/docker/x86_64-gnu/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
libssl-dev \
15+
pkg-config \
1416
xz-utils
1517

1618
COPY scripts/sccache.sh /scripts/

0 commit comments

Comments
 (0)