Skip to content

Commit 5d00a5d

Browse files
authoredNov 8, 2023
Rollup merge of #117679 - aDotInTheVoid:yes-core, r=GuillaumeGomez
tests/rustdoc-json: Avoid needless use of `no_core` and `lang_items` See #117487 for motivation. I've split it into three commits, depending on how much work it was to remove `#![no_core]`. The first is entirely mechanical, the second makes no logical changes but couldn't be done with find+replace, and the third required rewriting assertions no not depend on having `#![no_core]`. All of the interesting changes for review are in the third commit, so I recommend reviewing commit-by-commit. After this, 3 tests still use `#![no_core]`: - `./tests/rustdoc-json/primitives/primitive_impls.rs`. Uses impls on primitives, so needs to simulate core - `./tests/rustdoc-json/primitives/local_primitive.rs`: Uses `rustc_doc_primitive`, so needs to simulate core - `./tests/rustdoc-json/impls/auto.rs`: Uses auto traits, so needs to simulate core But after this change, we only rely on the core-rustc boundary in tests that deliberately test those interactions. r? ``@GuillaumeGomez`` Fixes #117487
2 parents c828371 + 434b69a commit 5d00a5d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+41
-202
lines changed
 

‎tests/rustdoc-json/doc_hidden_failure.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// Regression test for <https://github.com/rust-lang/rust/issues/98007>.
22

3-
#![feature(no_core)]
4-
#![no_core]
5-
63
mod auto {
74
mod action_row {
85
pub struct ActionRowBuilder;

‎tests/rustdoc-json/enums/field_hidden.rs

-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
// Regression test for <https://github.com/rust-lang/rust/issues/100529>.
22

3-
#![no_core]
4-
#![feature(no_core, lang_items)]
5-
6-
#[lang = "sized"]
7-
trait Sized {}
8-
93
// @has "$.index[*][?(@.name=='ParseError')]"
104
// @has "$.index[*][?(@.name=='UnexpectedEndTag')]"
115
// @is "$.index[*][?(@.name=='UnexpectedEndTag')].inner.variant.kind.tuple" [null]

0 commit comments

Comments
 (0)