Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #75712

Closed
wants to merge 26 commits into from
Closed

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Aug 19, 2020

Successful merges:

Failed merges:

r? @ghost

Mark-Simulacrum and others added 26 commits August 16, 2020 11:42
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.
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
…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
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
…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.
…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
Copy link
Member Author

tmandry commented Aug 19, 2020

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

@bors
Copy link
Contributor

bors commented Aug 19, 2020

📌 Commit d2dbc4c has been approved by tmandry

@rustbot rustbot added the rollup A PR which is a rollup label Aug 19, 2020
@bors 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
Copy link
Contributor

bors commented Aug 19, 2020

⌛ Testing commit d2dbc4c with merge 32c37780c1c1e192a8b0ea19d20046be6bc6654f...

@bors
Copy link
Contributor

bors commented Aug 19, 2020

💔 Test failed - checks-actions

@bors 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
Copy link
Member Author

tmandry commented Aug 19, 2020

---- [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
Copy link
Contributor

bors commented Aug 20, 2020

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants