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 3 pull requests #124426

Closed
wants to merge 9 commits into from
Closed

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Apr 27, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ShE3py and others added 9 commits April 25, 2024 13:09
Instead, use raw pointers to accomplish internal mutability throughout.
And avoid duplicating logic for visiting `Item`s with different kinds (regular, associated, foreign).
Co-authored-by: joboet <jonasboettiger@icloud.com>
…=fee1-dead

Fix substitution parts having a shifted underline in some cases

If two suggestions parts are side by side, the underline's offset:
(WIP PR as an example, not yet pushed)
```
error: expected a pattern, found an expression
 --> ./main.rs:4:9
  |
4 |         1 + 2 => 3
  |         ^^^^^ arbitrary expressions are not allowed in patterns
  |
help: check the value in an arm guard
  |
4 |         n if n == 1 + 2 => 3
  |         ~     +++++++++++++
```
The emitter didn't take into account that the string had shrunk/grown if two substitution parts were side-by-side (surprisingly, there was only one case in the ui testsuite.)

```
help: check the value in an arm guard
  |
4 |         n if n == 1 + 2 => 3
  |         ~ +++++++++++++
```

`@rustbot` label +A-suggestion-diagnostics
ast: Generalize item kind visiting

And avoid duplicating logic for visiting `Item`s with different kinds (regular, associated, foreign).

The diff is better viewed with whitespace ignored.
…-thread-locals, r=joboet

thread_local: be excruciatingly explicit in dtor code

Use raw pointers to accomplish internal mutability, and clearly split references where applicable. This reduces the likelihood that any of these parts are misunderstood, either by humans or the compiler's optimizations.

Fixes rust-lang#124317

r? `@joboet`
@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. rollup A PR which is a rollup labels Apr 27, 2024
@jhpratt
Copy link
Member Author

jhpratt commented Apr 27, 2024

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Apr 27, 2024

📌 Commit 5045321 has been approved by jhpratt

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 Apr 27, 2024
@bors
Copy link
Contributor

bors commented Apr 27, 2024

⌛ Testing commit 5045321 with merge 6d65491...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 27, 2024
Rollup of 3 pull requests

Successful merges:

 - rust-lang#124370 (Fix substitution parts having a shifted underline in some cases)
 - rust-lang#124382 (ast: Generalize item kind visiting)
 - rust-lang#124387 (thread_local: be excruciatingly explicit in dtor code)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Apr 27, 2024

💔 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 Apr 27, 2024
@jhpratt
Copy link
Member Author

jhpratt commented Apr 27, 2024

@bors retry

@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 Apr 27, 2024
@jhpratt
Copy link
Member Author

jhpratt commented Apr 27, 2024

@bors r-

Was hoping to sneak this in before the next run started, but that has since passed.

@jhpratt jhpratt closed this Apr 27, 2024
@jhpratt jhpratt deleted the rollup-7e9251f branch April 27, 2024 05:27
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants