Rollup of 7 pull requests #75712

tmandry · 2020-08-19T17:32:56Z

Successful merges:

move const param structural match checks to wfcheck #75069 (move const param structural match checks to wfcheck)
Adjust installation place for compiler docs #75593 (Adjust installation place for compiler docs)
Make OnceCell<T> transparent to dropck #75648 (Make OnceCell transparent to dropck)
Fix intra-doc links for inherent impls that are both lang items and not the default impl #75649 (Fix intra-doc links for inherent impls that are both lang items and not the default impl)
Suppress MIR comments of FnDef and unit types #75670 (Suppress MIR comments for FnDef in ty::Const)
Move to intra doc links for std::io #75674 (Move to intra doc links for std::io)
Remove #[cfg(miri)] from OnceCell tests #75696 (Remove #[cfg(miri)] from OnceCell tests)

Failed merges:

This avoids conflicts when installing with rustup; rustup does not currently support overlapping installations.

See the failed build in rust-lang#75555 (comment) for an example where we need this in real life

They were carried over from once_cell crate, but they are not entirely correct (as miri now supports more things), and we don't run miri tests for std, so let's just remove them. Maybe one day we'll run miri in std, but then we can just re-install these attributes.

@varkor

move const param structural match checks to wfcheck fixes rust-lang#75047 fixes rust-lang#74950 We currently check for structural match violations inside of `type_of`. As we need to check the array length when checking if `[NonEq; arr_len]` is structural match, we potentially require the variance of an expression. Computing the variance requires `type_of` for all types though, resulting in a cycle error. r? @varkor @eddyb

@matthiaskrgr

…not-overlap, r=pietroalbini Adjust installation place for compiler docs This avoids conflicts when installing with rustup; rustup does not currently support overlapping installations. r? @matthiaskrgr

@ghost

Make OnceCell<T> transparent to dropck See the failed build in rust-lang#75555 (comment) for an example where we need this in real life r? @ghost

@GuillaumeGomez

…aumegomez Fix intra-doc links for inherent impls that are both lang items and not the default impl I found in rust-lang#75464 (comment) that `str::to_uppercase()` doesn't resolve while `str::trim()` does. The only real difference is that `to_uppercase` is defined in `alloc`, while trim is defined in `core`. It turns out that rustdoc was ignoring `lang_items.str_alloc_impl()` - it saw them in `collect_trait_impls`, but not for intra-doc links. This uses the same `impls` for all parts of rustdoc, so that there can be no more inconsistency. It does have the slight downside that the matches are no longer exhaustive but it will be very clear if a new lang item is missed because it will panic when you try to document it (and if you don't document it, does rustdoc really need to know about it?). ~~This needs a test case (probably just `str::to_uppercase`).~~ Added. This is best reviewed commit-by-commit. r? @GuillaumeGomez

…-obk Suppress MIR comments for FnDef in ty::Const An expansion of rust-lang#75566. The comments in MIR constant already contains `ty::Contains` comments.

@rustbot

…jyn514 Move to intra doc links for std::io Helps with rust-lang#75080. @rustbot modify labels: T-doc, A-intra-doc-links, T-rustdoc r? @jyn514 I had no problems with those files so I added some small links here and there.

Remove `#[cfg(miri)]` from OnceCell tests They were carried over from once_cell crate, but they are not entirely correct (as miri now supports more things), and we don't run miri tests for std, so let's just remove them. Maybe one day we'll run miri in std, but then we can just re-install these attributes.

tmandry · 2020-08-19T17:33:19Z

@bors r+ rollup=never p=5
@rustbot modify labels: +rollup

bors · 2020-08-19T17:33:20Z

📌 Commit d2dbc4c has been approved by tmandry

bors · 2020-08-19T17:34:01Z

⌛ Testing commit d2dbc4c with merge 32c37780c1c1e192a8b0ea19d20046be6bc6654f...

bors · 2020-08-19T18:03:32Z

💔 Test failed - checks-actions

tmandry · 2020-08-19T18:10:15Z

---- [mir-opt] mir-opt/instrument_coverage.rs stdout ----
12	-         falseUnwind -> [real: bb1, cleanup: bb2]; // scope 0 at /the/src/instrument_coverage.rs:11:5: 15:6
13	+         StorageLive(_4);                 // scope 0 at /the/src/instrument_coverage.rs:10:11: 10:11
14	+         _4 = const std::intrinsics::count_code_region(const 16004455475339839479_u64, const 0_u32, const "/the/src/instrument_coverage.rs", const 10_u32, const 11_u32, const 16_u32, const 2_u32) -> bb7; // scope 0 at /the/src/instrument_coverage.rs:10:11: 10:11
-	+                                          // ty::Const
-	+                                          // + ty: unsafe extern "rust-intrinsic" fn(u64, u32, &'static str, u32, u32, u32, u32) {std::intrinsics::count_code_region}
-	+                                          // + val: Value(Scalar(<ZST>))
18	+                                          // mir::Constant
19	+                                          // + span: /the/src/instrument_coverage.rs:10:11: 10:11
20	+                                          // + literal: Const { ty: unsafe extern "rust-intrinsic" fn(u64, u32, &'static str, u32, u32, u32, u32) {std::intrinsics::count_code_region}, val: Value(Scalar(<ZST>)) }

29	      bb1: {
30	          StorageLive(_2);                 // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17
31	          _2 = const bar() -> [return: bb3, unwind: bb2]; // scope 0 at /the/src/instrument_coverage.rs:12:12: 12:17
-	                                           // ty::Const
-	                                           // + ty: fn() -> bool {bar}
-	                                           // + val: Value(Scalar(<ZST>))
35	                                           // mir::Constant
36	                                           // + span: /the/src/instrument_coverage.rs:12:12: 12:15
37	                                           // + literal: Const { ty: fn() -> bool {bar}, val: Value(Scalar(<ZST>)) }

thread '[mir-opt] mir-opt/instrument_coverage.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff', src/tools/compiletest/src/runtest.rs:3239:25

bors · 2020-08-20T15:18:11Z

☔ The latest upstream changes (presumably #75670) made this pull request unmergeable. Please resolve the merge conflicts.

Mark-Simulacrum and others added 26 commits August 16, 2020 11:42

Adjust installation place for compiler docs

172e67e

This avoids conflicts when installing with rustup; rustup does not currently support overlapping installations.

Make OnceCell<T> transparent to dropck

695d86f

See the failed build in rust-lang#75555 (comment) for an example where we need this in real life

Move to intra doc links for std::io

5d49c0e

move const param structural match checks to wfcheck

70dfe3f

run wfcheck in parralel again, add test for 74950

6ad01e9

change const param ty warning message

7542615

Suppress MIR comments for FnDef in ty::Const

9eeb3ee

bless tests

7c4d315

Refactor impl_for_type into a separate function

967ec1f

Say tcx.lang_items() less

8a0aa7b

Return all impls, not just the primary one

3ddd8b2

impl_for_type -> PrimitiveType::impls

06d6d3d

Allow reusing the code in collect_trait_impls

9cf2fa8

Use impls for intra doc links as well

219e93d

xpy fmt

121974e

Add a test

570b0d9

Fix nits in intra-doc links for std io

dad8e11

Add test for f32 and f64 methods

aff01f8

Rollup merge of rust-lang#75593 - Mark-Simulacrum:compiler-docs-must-…

42b3ed6

…not-overlap, r=pietroalbini Adjust installation place for compiler docs This avoids conflicts when installing with rustup; rustup does not currently support overlapping installations. r? @matthiaskrgr

Rollup merge of rust-lang#75648 - matklad:lazy-dropck, r=KodrAus

576c121

Make OnceCell<T> transparent to dropck See the failed build in rust-lang#75555 (comment) for an example where we need this in real life r? @ghost

Rollup merge of rust-lang#75670 - lzutao:suppress-mir-fndef-ty, r=oli…

5256b95

…-obk Suppress MIR comments for FnDef in ty::Const An expansion of rust-lang#75566. The comments in MIR constant already contains `ty::Contains` comments.

rustbot added the rollup A PR which is a rollup label Aug 19, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 19, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 19, 2020

tmandry mentioned this pull request Aug 19, 2020

Suppress MIR comments of FnDef and unit types #75670

Merged

Dylan-DPC-zz closed this Aug 20, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #75712

Rollup of 7 pull requests #75712

tmandry commented Aug 19, 2020

tmandry commented Aug 19, 2020

bors commented Aug 19, 2020

bors commented Aug 19, 2020

bors commented Aug 19, 2020

tmandry commented Aug 19, 2020

bors commented Aug 20, 2020

Rollup of 7 pull requests #75712

Rollup of 7 pull requests #75712

Conversation

tmandry commented Aug 19, 2020

tmandry commented Aug 19, 2020

bors commented Aug 19, 2020

bors commented Aug 19, 2020

bors commented Aug 19, 2020

tmandry commented Aug 19, 2020

bors commented Aug 20, 2020