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

Check that diagnostics happen in the line that they are annotated for #2167

Merged
merged 1 commit into from
Jun 1, 2022

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented May 30, 2022

fixes #2131

@bors
Copy link
Collaborator

bors commented May 31, 2022

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

ui_test/src/lib.rs Outdated Show resolved Hide resolved
ui_test/src/lib.rs Outdated Show resolved Hide resolved
ui_test/src/lib.rs Outdated Show resolved Hide resolved
ui_test/src/rustc_stderr.rs Show resolved Hide resolved
ui_test/src/rustc_stderr.rs Outdated Show resolved Hide resolved
ui_test/src/rustc_stderr.rs Outdated Show resolved Hide resolved
ui_test/src/rustc_stderr.rs Show resolved Hide resolved
ui_test/src/rustc_stderr.rs Outdated Show resolved Hide resolved
ui_test/src/tests.rs Outdated Show resolved Hide resolved
ui_test/src/tests.rs Outdated Show resolved Hide resolved
ui_test/src/lib.rs Outdated Show resolved Hide resolved
@oli-obk
Copy link
Contributor Author

oli-obk commented May 31, 2022

Ok, I think this is ready

ui_test/README.md Outdated Show resolved Hide resolved
ui_test/README.md Outdated Show resolved Hide resolved
@RalfJung
Copy link
Member

RalfJung commented Jun 1, 2022

r=me after squashing

@oli-obk
Copy link
Contributor Author

oli-obk commented Jun 1, 2022

@bors r=RalfJung

@bors
Copy link
Collaborator

bors commented Jun 1, 2022

📌 Commit 4b100a1 has been approved by RalfJung

@bors
Copy link
Collaborator

bors commented Jun 1, 2022

⌛ Testing commit 4b100a1 with merge f7c1b5b...

@bors
Copy link
Collaborator

bors commented Jun 1, 2022

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing f7c1b5b to master...

@bors bors merged commit f7c1b5b into master Jun 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UI tests should check that //~ annotations actually match an error on that line
3 participants