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 9 pull requests #107906

Closed
wants to merge 20 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

notriddle and others added 20 commits January 31, 2023 10:12
…ll, r=lcnr

Suggest function call on pattern type mismatch

Fixes rust-lang#101208

This could definitely be generalized to support more suggestions in pattern matches. We can't use all of [`FnCtxt::emit_type_mismatch_suggestions`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir_typeck/fn_ctxt/struct.FnCtxt.html#method.emit_type_mismatch_suggestions), but it's on my to-do list to play around with more suggestions that would be productive in this position.
 Rename atomic 'as_mut_ptr' to 'as_ptr' to match Cell (ref rust-lang#66893)

Originally discussed in rust-lang#66893 (comment)

~~This uses rust-lang#107706 as a base to avoid a merge conflict once that gets rolled up (so disregard const changes in the diff until it does)~~ all merged & rebased

`@rustbot` label +T-libs-api
r? m-ou-se
…tests, r=lcnr

Add a couple random projection tests for new solver

Self-explanatory, they're just some cases that have been on my mind in the past (especially `tests/ui/traits/new-solver/param-candidate-doesnt-shadow-project.rs`).
…tions, r=oli-obk

Add ui test for implementation on projection

The error in full can be seen in rust-lang#107263 and is part of why the PR is blocked (it still requires the approval from the team for supporting it).

r? `@oli-obk`
…s, r=scottmcm

Clarify `new_size` for realloc means bytes

Minor docs fix requested by rust-lang#107875
…ocs, r=notriddle

Reexported macros docs

Part of rust-lang#59368 (doesn't fix it, only improve the current situation a bit).

Macros were not correctly handled in reexports and the reexport attributes were not merged with the item either. This PR fixes both.

r? `@notriddle`
@rustbot rustbot added 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. rollup A PR which is a rollup labels Feb 10, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Feb 10, 2023

📌 Commit 7315281 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 10, 2023
@bors
Copy link
Contributor

bors commented Feb 11, 2023

⌛ Testing commit 7315281 with merge fb0719e733717d7b303e2569ae0522d2513db486...

@bors
Copy link
Contributor

bors commented Feb 11, 2023

💔 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 Feb 11, 2023
@tgross35
Copy link
Contributor

Looks like my PR broke this, I'll send a fix in a minute

@tgross35
Copy link
Contributor

@matthiaskrgr fixed in #107736. It's possible there are a few more replacements to be made, I don't have a good way to find them though since the preliminary CI doesn't catch it.

@rust-log-analyzer
Copy link
Collaborator

The job dist-x86_64-netbsd failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] core test:false 23.257
[RUSTC-TIMING] addr2line test:false 0.435
[RUSTC-TIMING] gimli test:false 4.691
[RUSTC-TIMING] object test:false 5.314
error[E0599]: no method named `as_mut_ptr` found for struct `AtomicI8` in the current scope
  --> library/std/src/sys_common/thread_parking/id.rs:63:33
   |
63 |                 park(self.state.as_mut_ptr().addr());


error[E0599]: no method named `as_mut_ptr` found for struct `AtomicI8` in the current scope
  --> library/std/src/sys_common/thread_parking/id.rs:79:42
   |
79 |             park_timeout(dur, self.state.as_mut_ptr().addr());


error[E0599]: no method named `as_mut_ptr` found for struct `AtomicI8` in the current scope
   --> library/std/src/sys_common/thread_parking/id.rs:102:36
    |
102 |             unpark(tid, self.state.as_mut_ptr().addr());

For more information about this error, try `rustc --explain E0599`.
[RUSTC-TIMING] std test:false 2.030
error: could not compile `std` due to 3 previous errors

@matthiaskrgr matthiaskrgr deleted the rollup-pif62fw branch March 16, 2024 18:19
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.

10 participants