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 6 pull requests #99202

Closed
wants to merge 33 commits into from
Closed

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

aDotInTheVoid and others added 30 commits July 2, 2022 00:11
Closes rust-lang#96189

Closes rust-lang#96189

Everything is `Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize`
except `Crate` and `Item` which arn't `Hash`, as they have `HashMap`'s.
See linked issue for reasoning.
…li-obk

Lower let-else in MIR

This MR will switch to lower let-else statements in MIR building instead.

To lower let-else in MIR, we build a mini-switch two branches. One branch leads to the matching case, and the other leads to the `else` block. This arrangement will allow temporary lifetime analysis running as-is so that the temporaries are properly extended according to the same rule applied to regular `let` statements.

cc rust-lang#87335

Fix rust-lang#98672
rustdoc-json-types: Clean up derives.

Closes rust-lang#96189

Everything is `Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize` except `Crate` and `Item` which arn't `Hash`, as they have `HashMap`'s. See linked issue for reasoning.

`@rustbot` modify labels: +T-rustdoc +A-rustdoc-json
`UnsafeCell` blocks niches inside its nested type from being available outside

fixes rust-lang#87341

This implements the plan by ``@eddyb`` in rust-lang#87341 (comment)

Somewhat related PR (not strictly necessary, but that cleanup made this PR simpler): rust-lang#94527
Add some autolabels for A-bootstrap and T-infra
…r-a, r=jyn514

Mention rust-analyzer maintainers when `proc_macro` bridge is changed

rust-analyzer vendors a modified copy of the `proc_macro` crate in order to expand procedural macros built by Cargo. Since the ABI used by proc macros can change, we need to follow along with those changes. Getting notified when the proc macro bridge changes should make that easier, since that's what defines the ABI.

cc ``@rust-lang/wg-rls-2``
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jul 13, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jul 13, 2022

📌 Commit c20ab96 has been approved by Dylan-DPC

It is now in the queue for this repository.

@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 Jul 13, 2022
@bors
Copy link
Contributor

bors commented Jul 13, 2022

⌛ Testing commit c20ab96 with merge 58854051f06ad768ce6cb6c551304a2bbdf08873...

@bors
Copy link
Contributor

bors commented Jul 13, 2022

💔 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 Jul 13, 2022
@rust-log-analyzer
Copy link
Collaborator

The job arm-android failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
---- [ui] src/test/ui/layout/unsafe-cell-hides-niche.rs stdout ----

error: test compilation failed although it shouldn't!
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/layout/unsafe-cell-hides-niche.rs" "-Zthreads=1" "--target=arm-linux-androideabi" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/layout/unsafe-cell-hides-niche" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/arm-linux-androideabi/native/rust-test-helpers" "-Clinker=/android/ndk/arm-14/bin/arm-linux-androideabi-clang" "--crate-type=lib" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/layout/unsafe-cell-hides-niche/auxiliary"
stdout: none
--- stderr -------------------------------
  --> /checkout/src/test/ui/layout/unsafe-cell-hides-niche.rs:27:36
   |
   |
LL |         const _: Size::<{$size}> = Size::<{size_of::<$ty>()}>;
   |                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `32_usize`, found `24_usize`
...
LL | check_sizes!(UnsafeCell<Vec4<N32>>: 16 => 32);
Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=arm-linux-androideabi
   |
   |
   = note: expected struct `Size<32_usize>`
              found struct `Size<24_usize>`
   = note: this error originates in the macro `check_sizes` (in Nightly builds, run with -Z macro-backtrace for more info)
error[E0308]: mismatched types
  --> /checkout/src/test/ui/layout/unsafe-cell-hides-niche.rs:27:36
   |
   |
LL |         const _: Size::<{$size}> = Size::<{size_of::<$ty>()}>;
   |                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `32_usize`, found `24_usize`
...
LL | check_sizes!(UnsafeCell<Vec4<N32>>: 16 => 32);
   |
   |
   = note: expected struct `Size<32_usize>`
              found struct `Size<24_usize>`
   = note: this error originates in the macro `check_sizes` (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0308`.
------------------------------------------

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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants