mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-28 01:34:21 +00:00
Auto merge of #118353 - matthiaskrgr:rollup-sf1booi, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #118322 (skip {tidy,compiletest,rustdoc-gui} based tests for `DocTests::Only`) - #118325 (Fix Rustdoc search docs link) - #118338 (Backticks fixes) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
cc1130732d
@ -151,7 +151,7 @@ pub fn print_crate<'a>(
|
||||
/// Note: some old proc macros parse pretty-printed output, so changes here can
|
||||
/// break old code. For example:
|
||||
/// - #63896: `#[allow(unused,` must be printed rather than `#[allow(unused ,`
|
||||
/// - #73345: `#[allow(unused)] must be printed rather than `# [allow(unused)]
|
||||
/// - #73345: `#[allow(unused)]` must be printed rather than `# [allow(unused)]`
|
||||
///
|
||||
fn space_between(tt1: &TokenTree, tt2: &TokenTree) -> bool {
|
||||
use token::*;
|
||||
|
@ -23,14 +23,14 @@ mod newtype;
|
||||
/// The impls provided by default are Clone, Copy, PartialEq, Eq, and Hash.
|
||||
///
|
||||
/// Accepted attributes for customization:
|
||||
/// - #[derive(HashStable_Generic)]/#[derive(HashStable)]: derives
|
||||
/// - `#[derive(HashStable_Generic)]`/`#[derive(HashStable)]`: derives
|
||||
/// `HashStable`, as normal.
|
||||
/// - #[encodable]: derives `Encodable`/`Decodable`.
|
||||
/// - #[orderable]: derives `PartialOrd`/`Ord`, plus step-related methods.
|
||||
/// - #[debug_format = "Foo({})"]: derives `Debug` with particular output.
|
||||
/// - #[max = 0xFFFF_FFFD]: specifies the max value, which allows niche
|
||||
/// - `#[encodable]`: derives `Encodable`/`Decodable`.
|
||||
/// - `#[orderable]`: derives `PartialOrd`/`Ord`, plus step-related methods.
|
||||
/// - `#[debug_format = "Foo({})"]`: derives `Debug` with particular output.
|
||||
/// - `#[max = 0xFFFF_FFFD]`: specifies the max value, which allows niche
|
||||
/// optimizations. The default max value is 0xFFFF_FF00.
|
||||
/// - #[gate_rustc_only]: makes parts of the generated code nightly-only.
|
||||
/// - `#[gate_rustc_only]`: makes parts of the generated code nightly-only.
|
||||
#[proc_macro]
|
||||
#[cfg_attr(
|
||||
feature = "nightly",
|
||||
|
@ -999,6 +999,7 @@ impl Step for RustdocGUI {
|
||||
let run = run.suite_path("tests/rustdoc-gui");
|
||||
run.lazy_default_condition(Box::new(move || {
|
||||
builder.config.nodejs.is_some()
|
||||
&& builder.doc_tests != DocTests::Only
|
||||
&& builder
|
||||
.config
|
||||
.npm
|
||||
@ -1158,7 +1159,8 @@ HELP: to skip test's attempt to check tidiness, pass `--skip src/tools/tidy` to
|
||||
}
|
||||
|
||||
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
|
||||
run.path("src/tools/tidy")
|
||||
let default = run.builder.doc_tests != DocTests::Only;
|
||||
run.path("src/tools/tidy").default_condition(default)
|
||||
}
|
||||
|
||||
fn make_run(run: RunConfig<'_>) {
|
||||
@ -1560,6 +1562,10 @@ impl Step for Compiletest {
|
||||
/// compiletest `mode` and `suite` arguments. For example `mode` can be
|
||||
/// "run-pass" or `suite` can be something like `debuginfo`.
|
||||
fn run(self, builder: &Builder<'_>) {
|
||||
if builder.doc_tests == DocTests::Only {
|
||||
return;
|
||||
}
|
||||
|
||||
if builder.top_stage == 0 && env::var("COMPILETEST_FORCE_STAGE0").is_err() {
|
||||
eprintln!("\
|
||||
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 {
|
||||
}
|
||||
|
||||
fn run(self, builder: &Builder<'_>) {
|
||||
builder.ensure(compile::Std::new(self.compiler, self.target));
|
||||
|
||||
builder.ensure(Crate {
|
||||
compiler: self.compiler,
|
||||
target: self.target,
|
||||
|
@ -1318,8 +1318,7 @@ function preLoadCss(cssUrl) {
|
||||
|
||||
const infos = [
|
||||
`For a full list of all search features, take a look <a \
|
||||
href="https://doc.rust-lang.org/${channel}/rustdoc/how-to-read-rustdoc.html\
|
||||
#the-search-interface">here</a>.`,
|
||||
href="https://doc.rust-lang.org/${channel}/rustdoc/read-documentation/search.html">here</a>.`,
|
||||
"Prefix searches with a type followed by a colon (e.g., <code>fn:</code>) to \
|
||||
restrict the search to a given item kind.",
|
||||
"Accepted kinds are: <code>fn</code>, <code>mod</code>, <code>struct</code>, \
|
||||
|
Loading…
Reference in New Issue
Block a user