Skip to content

piece of diagnostic migrate#103960

Merged
bors merged 4 commits intorust-lang:masterfrom
AndyJado:var_path_only_diag
Nov 11, 2022
Merged

piece of diagnostic migrate#103960
bors merged 4 commits intorust-lang:masterfrom
AndyJado:var_path_only_diag

Conversation

@AndyJado
Copy link
Contributor

@AndyJado AndyJado commented Nov 4, 2022

@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. labels Nov 4, 2022
Noratrieb
Noratrieb reviewed Nov 4, 2022
View reviewed changes
@AndyJado AndyJado marked this pull request as ready for review November 4, 2022 12:45
@rustbot
Copy link
Collaborator

rustbot commented Nov 4, 2022

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

@AndyJado AndyJado mentioned this pull request Nov 6, 2022
Merged
davidtwco
davidtwco approved these changes Nov 8, 2022
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, one nit then r=me

compiler/rustc_borrowck/src/diagnostics/mod.rs Outdated
Comment on lines 598 to 599
Copy link
Member

@davidtwco davidtwco Nov 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Add a span label to the use of the captured variable, if it exists.
// only adds label to the `path_span`
/// Add a span label to the use of the captured variable, if it exists.
/// only adds label to the `path_span`

@davidtwco davidtwco mentioned this pull request Nov 8, 2022
Open
84 tasks
@bors
Copy link
Collaborator

bors commented Nov 9, 2022

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

@AndyJado
lint auto pass
e636af7 
Revert "lint auto pass"

This reverts commit e58e4466384924c491a932d3f18ef50ffa5a5065.
@AndyJado
remove old var_span_path_only
a0cee0a 
doc comment
@AndyJado
var_subdiag refinement
abf259c 
trim old
@AndyJado
struct error E0505
057d8e5
@estebank
Copy link
Contributor

estebank commented Nov 11, 2022

@bors r=davidtwco

@bors
Copy link
Collaborator

bors commented Nov 11, 2022

📌 Commit 057d8e5 has been approved by [davidtwco](https://github.com/davidtwco)

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 Nov 11, 2022
@estebank
Copy link
Contributor

estebank commented Nov 11, 2022

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 11, 2022
@estebank
Copy link
Contributor

estebank commented Nov 11, 2022

@bors r=davidtwco

@bors
Copy link
Collaborator

bors commented Nov 11, 2022

📌 Commit 057d8e5 has been approved by davidtwco

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 11, 2022
@Manishearth Manishearth mentioned this pull request Nov 11, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 11, 2022
@bors
Auto merge of rust-lang#104293 - Manishearth:rollup-xj92d0k, r=Manish…
42325c5 
…earth

Rollup of 8 pull requests

Successful merges:

 - rust-lang#95292 (Allow specialized const trait impls.)
 - rust-lang#100386 (Make `Sized` coinductive, again)
 - rust-lang#102215 (Implement the `+whole-archive` modifier for `wasm-ld`)
 - rust-lang#103468 (Fix unused lint and parser caring about spaces to won't produce invalid code)
 - rust-lang#103531 (Suggest calling the instance method of the same name when method not found)
 - rust-lang#103960 (piece of diagnostic migrate)
 - rust-lang#104051 (update Miri)
 - rust-lang#104129 (rustdoc: use javascript to layout notable traits popups)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a13809a into rust-lang:master Nov 11, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 11, 2022
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
@Manishearth
Rollup merge of rust-lang#103960 - AndyJado:var_path_only_diag, r=dav…
56da10d 
…idtwco

piece of diagnostic migrate

r? `@davidtwco`
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
@bors
Auto merge of rust-lang#104293 - Manishearth:rollup-xj92d0k, r=Manish…
174aef4 
…earth

Rollup of 8 pull requests

Successful merges:

 - rust-lang#95292 (Allow specialized const trait impls.)
 - rust-lang#100386 (Make `Sized` coinductive, again)
 - rust-lang#102215 (Implement the `+whole-archive` modifier for `wasm-ld`)
 - rust-lang#103468 (Fix unused lint and parser caring about spaces to won't produce invalid code)
 - rust-lang#103531 (Suggest calling the instance method of the same name when method not found)
 - rust-lang#103960 (piece of diagnostic migrate)
 - rust-lang#104051 (update Miri)
 - rust-lang#104129 (rustdoc: use javascript to layout notable traits popups)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 17, 2023
@matthiaskrgr
Rollup merge of rust-lang#104055 - AndyJado:bck_errors, r=davidtwco
91fe117 
Migrate diagnostics in `rustc_borrowck`

sorry for making a new PR, [rust-lang#103559](rust-lang#103559) and [rust-lang#103960](rust-lang#103960).

I am crawling, joyfully.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Noratrieb Noratrieb Noratrieb left review comments

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels

A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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.

Projects

None yet

Milestone

1.67.0

Development

Successfully merging this pull request may close these issues.

6 participants

@AndyJado @rustbot @bors @estebank @davidtwco @Noratrieb