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

docs/test: add UI test and long-form error docs for E0461 #106028

Merged
merged 1 commit into from
Dec 28, 2022
Merged

docs/test: add UI test and long-form error docs for E0461 #106028

merged 1 commit into from
Dec 28, 2022

Conversation

Ezrashaw
Copy link
Contributor

Might take a couple of tries to pass CI. The UI test is x86-linux only; I'm not sure how to generalize it to other architectures.

r? @GuillaumeGomez

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Dec 22, 2022
@rustbot
Copy link
Collaborator

rustbot commented Dec 22, 2022

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@GuillaumeGomez
Copy link
Member

Apart from the nit, seems good to me.

@Ezrashaw
Copy link
Contributor Author

Ezrashaw commented Dec 22, 2022 •
edited
Loading

@GuillaumeGomez This completes another for #61137.
Additionally:

Thanks for all your help, this whole thing has been a great first time contributing experience!

@GuillaumeGomez
Copy link
Member

Thanks! Also thanks for the info. I'll update the issue accordingly.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 23, 2022

📌 Commit bc898c8271ab6ddf25115503adaf463b9f4acb98 has been approved by GuillaumeGomez

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 Dec 23, 2022
@GuillaumeGomez GuillaumeGomez mentioned this pull request Dec 23, 2022
Closed
100 tasks
This was referenced Dec 23, 2022
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 24, 2022
@bors
Auto merge of rust-lang#106103 - matthiaskrgr:rollup-8xe9ddz, r=matth…
6c0c6d6 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#105970 (docs/test: add UI test and long-form error docs for E0462)
 - rust-lang#105975 (rustc: Remove needless lifetimes)
 - rust-lang#106069 (rustdoc: use a more evocative name for CSS/JS `#titles`)
 - rust-lang#106084 (fix vec::IntoIter::drop on high-alignment ZST)
 - rust-lang#106091 (Use correct CSS pseudo-element selector)
 - rust-lang#106093 (rustdoc: remove no-op CSS from `.docblock-short`)
 - rust-lang#106102 (Fix `triagebot.toml`)

Failed merges:

 - rust-lang#106028 (docs/test: add UI test and long-form error docs for `E0461`)

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

rustbot commented Dec 24, 2022

Some changes occurred in src/tools/cargo

cc @ehuss

@Ezrashaw
Copy link
Contributor Author

@GuillaumeGomez Umm, not sure what has happened. My other PR made this unmergeable, and then when I fix the conflicts something happened with the cargo submodule.

@Ezrashaw Ezrashaw force-pushed the add-docs+test-e0461 branch 2 times, most recently from 2a465c5 to 6672bfb Compare December 24, 2022 05:59
@GuillaumeGomez
Copy link
Member

Weird. Well, simplest way: git reset --hard HEAD~1 (to remove your last commit) then re-make the changes (since they aren't many, should be fine).

@Ezrashaw
Copy link
Contributor Author

Hmm, quite weird, considering my local git was completely happy. Should be good once CI passes.

@GuillaumeGomez
Copy link
Member

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 24, 2022

📌 Commit 6cc3da196eaf56a398650cc3186ec9117084e4b1 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Dec 24, 2022

⌛ Testing commit 6cc3da196eaf56a398650cc3186ec9117084e4b1 with merge e60036e9fe174feb508401c24e168e0509ddaee9...

@bors
Copy link
Contributor

bors commented Dec 24, 2022

💔 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 Dec 24, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Ezrashaw
Copy link
Contributor Author

Ezrashaw commented Dec 27, 2022 •
edited
Loading

@GuillaumeGomez I've removed the UI test on the basis that it is just too finicky to actually test the error code. I'm not even sure if the testing framework could test this error code. Sorry for the delay/ far too many CI attempts.

@GuillaumeGomez
Copy link
Member

That's a shame but we can always give it another try later. Adding this explanation is already an improvement in any case. Thanks for working on this!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 28, 2022

📌 Commit f66e752 has been approved by GuillaumeGomez

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 Dec 28, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 28, 2022
@matthiaskrgr
Rollup merge of rust-lang#106028 - Ezrashaw:add-docs+test-e0461, r=Gu…
72ef979 
…illaumeGomez

docs/test: add UI test and long-form error docs for `E0461`

Might take a couple of tries to pass CI. The UI test is x86-linux only; I'm not sure how to generalize it to other architectures.

r? `@GuillaumeGomez`
This was referenced Dec 28, 2022
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 28, 2022
@bors
Auto merge of rust-lang#106215 - matthiaskrgr:rollup-53r89ww, r=matth…
270c94e 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#106028 (docs/test: add UI test and long-form error docs for `E0461`)
 - rust-lang#106172 (Suggest `impl Iterator` when possible for `_` return type)
 - rust-lang#106173 (Deduplicate `op` methods)
 - rust-lang#106176 (Recover `fn` keyword as `Fn` trait in bounds)
 - rust-lang#106194 (rustdoc: combine common sidebar background color CSS rules)
 - rust-lang#106199 (Silence knock-down errors on `[type error]` bindings)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f33ea41 into rust-lang:master Dec 28, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 28, 2022
@Ezrashaw Ezrashaw deleted the add-docs+test-e0461 branch December 28, 2022 23:34
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
@bors
Auto merge of rust-lang#106103 - matthiaskrgr:rollup-8xe9ddz, r=matth…
3c5198d 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#105970 (docs/test: add UI test and long-form error docs for E0462)
 - rust-lang#105975 (rustc: Remove needless lifetimes)
 - rust-lang#106069 (rustdoc: use a more evocative name for CSS/JS `#titles`)
 - rust-lang#106084 (fix vec::IntoIter::drop on high-alignment ZST)
 - rust-lang#106091 (Use correct CSS pseudo-element selector)
 - rust-lang#106093 (rustdoc: remove no-op CSS from `.docblock-short`)
 - rust-lang#106102 (Fix `triagebot.toml`)

Failed merges:

 - rust-lang#106028 (docs/test: add UI test and long-form error docs for `E0461`)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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.68.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Ezrashaw @rustbot @GuillaumeGomez @bors @rust-log-analyzer