diff options
| author | bors <bors@rust-lang.org> | 2021-09-24 01:48:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-24 01:48:02 +0000 |
| commit | 293b8f2c11cbec03f0d4daae6b82ed7541ebbf4e (patch) | |
| tree | 8b2059d304cdf68e31a428247287d154f02c75fa /src/test/rustdoc | |
| parent | 900cf5e8905ba8a2a9c99a1dfc9cb2cf4754d77a (diff) | |
| parent | 1875cecfd46a347dac9c9e23910e4b39be3a9d5f (diff) | |
| download | rust-293b8f2c11cbec03f0d4daae6b82ed7541ebbf4e.tar.gz rust-293b8f2c11cbec03f0d4daae6b82ed7541ebbf4e.zip | |
Auto merge of #89211 - workingjubilee:rollup-fj4eduk, r=workingjubilee
Rollup of 7 pull requests Successful merges: - #88612 (Add a better error message for #39364) - #89023 (Resolve issue : Somewhat confusing error with extended_key_value_attributes) - #89148 (Suggest `_` in turbofish if param will be inferred from fn argument) - #89171 (Run `no_core` rustdoc tests only on Linux) - #89176 (Change singular to plural) - #89184 (Temporarily rename int_roundings functions to avoid conflicts) - #89200 (Fix typo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/cross-crate-primitive-doc.rs | 2 | ||||
| -rw-r--r-- | src/test/rustdoc/intra-doc/prim-methods-external-core.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/rustdoc/cross-crate-primitive-doc.rs b/src/test/rustdoc/cross-crate-primitive-doc.rs index 120b6e9747f..4ba296ee04a 100644 --- a/src/test/rustdoc/cross-crate-primitive-doc.rs +++ b/src/test/rustdoc/cross-crate-primitive-doc.rs @@ -1,6 +1,6 @@ // aux-build:primitive-doc.rs // compile-flags: --extern-html-root-url=primitive_doc=../ -Z unstable-options -// ignore-windows +// only-linux #![feature(no_core)] #![no_core] diff --git a/src/test/rustdoc/intra-doc/prim-methods-external-core.rs b/src/test/rustdoc/intra-doc/prim-methods-external-core.rs index 5a92a28556e..9d869984bbd 100644 --- a/src/test/rustdoc/intra-doc/prim-methods-external-core.rs +++ b/src/test/rustdoc/intra-doc/prim-methods-external-core.rs @@ -1,7 +1,7 @@ // aux-build:my-core.rs // build-aux-docs // ignore-cross-compile -// ignore-windows +// only-linux #![deny(broken_intra_doc_links)] #![feature(no_core, lang_items)] |