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.

Sign up for GitHub

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

Jump to bottom

Improve conflict marker recovery #126125

Merged
merged 2 commits into from
Jun 21, 2024
Merged

Improve conflict marker recovery #126125

merged 2 commits into from
Jun 21, 2024

Conversation

dev-ardi
Copy link
Contributor

@dev-ardi dev-ardi commented Jun 7, 2024 •
edited
Loading

closes #113826
r? @estebank since you reviewed #115413
cc: @rben01 since you opened up the issue in the first place

@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. labels Jun 7, 2024
@rustbot rustbot assigned estebank and unassigned fmease Jun 7, 2024
Noratrieb
Noratrieb reviewed Jun 7, 2024
View reviewed changes
compiler/rustc_parse/src/parser/diagnostics.rs
@@ -2989,14 +2989,18 @@ impl<'a> Parser<'a> {
}

pub fn err_vcs_conflict_marker(&mut self) -> PResult<'a, ()> {
// <<<<<<<
Copy link
Member

Choose a reason for hiding this comment

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

those are some really cool comments

@bors
Copy link
Contributor

bors commented Jun 7, 2024

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@dev-ardi dev-ardi force-pushed the conflict-markers branch 2 times, most recently from 4b9e0e1 to 1625fed Compare June 14, 2024 12:30
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@estebank
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 20, 2024

📌 Commit 9f63712 has been approved by estebank

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 Jun 20, 2024
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 21, 2024
@workingjubilee
Rollup merge of rust-lang#126125 - dev-ardi:conflict-markers, r=estebank
b1d0604 
Improve conflict marker recovery

<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.

This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using

    r​? <reviewer name>
-->
closes rust-lang#113826
r? `@estebank` since you reviewed rust-lang#115413
cc: `@rben01` since you opened up the issue in the first place
@workingjubilee workingjubilee mentioned this pull request Jun 21, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 21, 2024
@bors
Auto merge of rust-lang#126771 - workingjubilee:rollup-wjof1kc, r=wor…
07fef41 
…kingjubilee

Rollup of 9 pull requests

Successful merges:

 - rust-lang#124101 (Add PidFd::{kill, wait, try_wait})
 - rust-lang#126125 (Improve conflict marker recovery)
 - rust-lang#126481 (Add `powerpc-unknown-openbsd` maintaince status)
 - rust-lang#126613 (Print the tested value in int_log tests)
 - rust-lang#126617 (Expand `avx512_target_feature` to include VEX variants)
 - rust-lang#126707 (Pass target to inaccessible-temp-dir rmake test)
 - rust-lang#126712 (Migrate `relocation-model`, `error-writing-dependencies` and `crate-name-priority` `run-make` tests to rmake)
 - rust-lang#126757 (Properly gate `safe` keyword in pre-expansion)
 - rust-lang#126758 (Do not allow safe/unsafe on static and fn items)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 21, 2024
@matthiaskrgr
Rollup merge of rust-lang#126125 - dev-ardi:conflict-markers, r=estebank
6c4f668 
Improve conflict marker recovery

<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.

This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using

    r​? <reviewer name>
-->
closes rust-lang#113826
r? ``@estebank`` since you reviewed rust-lang#115413
cc: ``@rben01`` since you opened up the issue in the first place
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 21, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 21, 2024
@bors
Auto merge of rust-lang#126775 - matthiaskrgr:rollup-ydxpehb, r=matth…
6e3df73 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#124101 (Add PidFd::{kill, wait, try_wait})
 - rust-lang#126125 (Improve conflict marker recovery)
 - rust-lang#126481 (Add `powerpc-unknown-openbsd` maintenance status)
 - rust-lang#126613 (Print the tested value in int_log tests)
 - rust-lang#126617 (Expand `avx512_target_feature` to include VEX variants)
 - rust-lang#126700 (Make edition dependent `:expr` macro fragment act like the edition-dependent `:pat` fragment does)
 - rust-lang#126707 (Pass target to inaccessible-temp-dir rmake test)
 - rust-lang#126767 (`StaticForeignItem` and `StaticItem` are the same)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 21, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 21, 2024
@bors
Auto merge of rust-lang#126781 - matthiaskrgr:rollup-5u4pens, r=matth…
d40f30e 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#126125 (Improve conflict marker recovery)
 - rust-lang#126481 (Add `powerpc-unknown-openbsd` maintenance status)
 - rust-lang#126613 (Print the tested value in int_log tests)
 - rust-lang#126617 (Expand `avx512_target_feature` to include VEX variants)
 - rust-lang#126700 (Make edition dependent `:expr` macro fragment act like the edition-dependent `:pat` fragment does)
 - rust-lang#126707 (Pass target to inaccessible-temp-dir rmake test)
 - rust-lang#126767 (`StaticForeignItem` and `StaticItem` are the same)
 - rust-lang#126774 (Fix another assertion failure for some Expect diagnostics.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 73cc4ec into rust-lang:master Jun 21, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 21, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 21, 2024
@rust-timer
Unrolled build for rust-lang#126125
906c52f 
Rollup merge of rust-lang#126125 - dev-ardi:conflict-markers, r=estebank

Improve conflict marker recovery

<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.

This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using

    r​? <reviewer name>
-->
closes rust-lang#113826
r? ```@estebank``` since you reviewed rust-lang#115413
cc: ```@rben01``` since you opened up the issue in the first place
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

@estebank estebank estebank left review comments

Assignees

@estebank estebank

Labels
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.81.0
Development

Successfully merging this pull request may close these issues.

Improve error output of “Detect diff markers in the parser”
7 participants
@dev-ardi @bors @rust-log-analyzer @estebank @Noratrieb @fmease @rustbot