Skip to content

Commit 76713b3

Browse files
committed
Auto merge of rust-lang#118332 - GuillaumeGomez:rollup-4tiosec, r=GuillaumeGomez
Rollup of 4 pull requests Successful merges: - rust-lang#118321 (rustdoc: Remove space from fake-variadic fn ptr impls) - rust-lang#118322 (skip {tidy,compiletest,rustdoc-gui} based tests for `DocTests::Only`) - rust-lang#118325 (Fix Rustdoc search docs link) - rust-lang#118327 (Add my work email to the mailmap) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6cf0888 + 5ad57d7 commit 76713b3

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

.mailmap

+2-1
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,8 @@ Val Markovic <[email protected]>
575575
Valerii Lashmanov <[email protected]>
576576
Vitali Haravy <[email protected]> Vitali Haravy <[email protected]>
577577
Vitaly Shukela <[email protected]>
578-
Waffle Maybe <[email protected]>
578+
Waffle Lapkin <[email protected]>
579+
Waffle Lapkin <[email protected]>
579580
580581
whitequark <[email protected]>
581582

library/core/src/primitive_docs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1629,7 +1629,7 @@ mod prim_ref {}
16291629
///
16301630
/// ### Trait implementations
16311631
///
1632-
/// In this documentation the shorthand `fn (T₁, T₂, …, Tₙ)` is used to represent non-variadic
1632+
/// In this documentation the shorthand `fn(T₁, T₂, …, Tₙ)` is used to represent non-variadic
16331633
/// function pointers of varying length. Note that this is a convenience notation to avoid
16341634
/// repetitive documentation, not valid Rust syntax.
16351635
///

src/bootstrap/src/core/build_steps/test.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -999,6 +999,7 @@ impl Step for RustdocGUI {
999999
let run = run.suite_path("tests/rustdoc-gui");
10001000
run.lazy_default_condition(Box::new(move || {
10011001
builder.config.nodejs.is_some()
1002+
&& builder.doc_tests != DocTests::Only
10021003
&& builder
10031004
.config
10041005
.npm
@@ -1158,7 +1159,8 @@ HELP: to skip test's attempt to check tidiness, pass `--skip src/tools/tidy` to
11581159
}
11591160

11601161
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
1161-
run.path("src/tools/tidy")
1162+
let default = run.builder.doc_tests != DocTests::Only;
1163+
run.path("src/tools/tidy").default_condition(default)
11621164
}
11631165

11641166
fn make_run(run: RunConfig<'_>) {
@@ -1560,6 +1562,10 @@ impl Step for Compiletest {
15601562
/// compiletest `mode` and `suite` arguments. For example `mode` can be
15611563
/// "run-pass" or `suite` can be something like `debuginfo`.
15621564
fn run(self, builder: &Builder<'_>) {
1565+
if builder.doc_tests == DocTests::Only {
1566+
return;
1567+
}
1568+
15631569
if builder.top_stage == 0 && env::var("COMPILETEST_FORCE_STAGE0").is_err() {
15641570
eprintln!("\
15651571
ERROR: `--stage 0` runs compiletest on the beta compiler, not your local changes, and will almost always cause tests to fail
@@ -2323,6 +2329,8 @@ impl Step for CrateLibrustc {
23232329
}
23242330

23252331
fn run(self, builder: &Builder<'_>) {
2332+
builder.ensure(compile::Std::new(self.compiler, self.target));
2333+
23262334
builder.ensure(Crate {
23272335
compiler: self.compiler,
23282336
target: self.target,

src/librustdoc/html/format.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ impl clean::Impl {
13051305
primitive_link_fragment(
13061306
f,
13071307
PrimitiveType::Tuple,
1308-
format_args!("fn ({name}₁, {name}₂, …, {name}ₙ{ellipsis})"),
1308+
format_args!("fn({name}₁, {name}₂, …, {name}ₙ{ellipsis})"),
13091309
"#trait-implementations-1",
13101310
cx,
13111311
)?;

src/librustdoc/html/static/js/main.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1318,8 +1318,7 @@ function preLoadCss(cssUrl) {
13181318

13191319
const infos = [
13201320
`For a full list of all search features, take a look <a \
1321-
href="https://doc.rust-lang.org/${channel}/rustdoc/how-to-read-rustdoc.html\
1322-
#the-search-interface">here</a>.`,
1321+
href="https://doc.rust-lang.org/${channel}/rustdoc/read-documentation/search.html">here</a>.`,
13231322
"Prefix searches with a type followed by a colon (e.g., <code>fn:</code>) to \
13241323
restrict the search to a given item kind.",
13251324
"Accepted kinds are: <code>fn</code>, <code>mod</code>, <code>struct</code>, \

0 commit comments

Comments
 (0)