Add check to ensure error code explanations are not removed anymore even if not emitted by GuillaumeGomez · Pull Request #86623 · rust-lang/rust

GuillaumeGomez · 2021-06-25T14:01:47Z

The error explanations are useful in case you use older version of the compiler. Even more if they had an explanation. If they are not emitted, their explanations should be updated but not removed (as we did for a few of them, like E0001).

r? @Mark-Simulacrum

GuillaumeGomez · 2021-06-28T15:33:43Z

Moved the check into validate-toolstate.sh in mingw-check.

Mark-Simulacrum · 2021-06-28T15:36:49Z

This is unrelated to validating toolstate, so it should go in a separate file.

GuillaumeGomez · 2021-06-28T15:55:37Z

Created a new bash script I'm now calling in the Dockerfile.

Mark-Simulacrum · 2021-06-28T16:11:51Z

Please push a temp commit to make sure this works (mingw-check should fail on the PR) and also we may need to somehow skip this script in local docker invocations (where FETCH_HEAD is meaningless). I'm not sure what the best way of doing that would be, but it may also be OK to not worry too much about it -- if you could check that src/ci/docker/run.sh mingw-check works locally that would be sufficient for me (it may not actually detect deleted error codes but that's OK, just shouldn't fail).

GuillaumeGomez · 2021-06-28T19:23:57Z

$ src/ci/docker/run.sh mingw-check
...
Build completed successfully in 0:00:33
+ /scripts/validate-toolstate.sh
Cloning into 'rust-toolstate'...
<Nothing changed>
+ /scripts/validate-error-codes.sh
/scripts/validate-error-codes.sh: line 6: BASE_COMMIT: unbound variable
+ es-check es5 ../src/librustdoc/html/static/main.js ../src/librustdoc/html/static/search.js ../src/librustdoc/html/static/settings.js ../src/librustdoc/html/static/source-script.js ../src/librustdoc/html/static/storage.js
ES-Check: there were no ES version matching errors! 🎉
+ eslint ../src/librustdoc/html/static/main.js ../src/librustdoc/html/static/search.js ../src/librustdoc/html/static/settings.js ../src/librustdoc/html/static/source-script.js ../src/librustdoc/html/static/storage.js
Compile requests 237
Compile requests executed 215
Cache hits 13
Cache misses 202
Cache timeouts 0
Cache read errors 0
Forced recaches 0
Cache write errors 0
Compilation failures 0
Cache errors 0
Non-cacheable compilations 0
Non-cacheable calls 18
Non-compilation calls 4
Unsupported compiler calls 0
Average cache write 0.000 s
Average cache read miss 0.105 s
Average cache read hit 0.000 s
Cache location Local disk: "/sccache"
Cache size 491 KiB
Max cache size 10 GiB
== clock drift check ==
local time: Mon Jun 28 19:08:09 UTC 2021
network time: Mon, 28 Jun 2021 01:34:02 GMT
== end clock drift check ==

So this part is working fine apparently. Even with:

/scripts/validate-error-codes.sh: line 6: BASE_COMMIT: unbound variable

Mark-Simulacrum · 2021-06-28T19:40:41Z

It looks like CI here is passing, but the E0001 code is deleted so presumably CI should fail. My guess is that the BASE_COMMIT variable is not set in the script -- you'll need to find a way to pipe it through. I'm not sure where it gets set, though, so there's likely some investigation that needs to be done.

GuillaumeGomez · 2021-07-02T13:08:36Z

IT WORKS! 🎉

Removing unwanted commit and it's good to go. :)

…ven if not emitted

GuillaumeGomez · 2021-07-02T14:14:51Z

@Mark-Simulacrum This is now ready.

GuillaumeGomez · 2021-07-02T22:02:27Z

Updated! Only setting BASE_COMMIT if on CI. Then the error code removal checker only runs if the variable is not empty (so if it doesn't exist, it doesn't run either).

GuillaumeGomez · 2021-07-03T09:21:45Z

@Mark-Simulacrum Should be ready now.

Mark-Simulacrum · 2021-07-04T17:06:27Z

@bors r+ rollup

bors · 2021-07-04T17:06:29Z

📌 Commit d6962ff has been approved by Mark-Simulacrum

Rollup of 8 pull requests Successful merges: - rust-lang#86477 (E0716: clarify that equivalent code example is erroneous) - rust-lang#86623 (Add check to ensure error code explanations are not removed anymore even if not emitted) - rust-lang#86856 (Make x.py less verbose on failures) - rust-lang#86858 (Stabilize `string_drain_as_str`) - rust-lang#86859 (Add a regression test for issue-69323) - rust-lang#86862 (re-export SwitchIntEdgeEffects) - rust-lang#86864 (Add missing code example for Write::write_vectored) - rust-lang#86874 (Bump deps) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…crum Prepare beta 1.55.0 Included backports: * rust-lang#86696 * rust-lang#87390 (squashed) Reverted: * rust-lang#86623 cc `@rust-lang/release` `@Mark-Simulacrum`

…bini Remove git fetch from CI rust-lang#86623 added a call to `git fetch`, which is problematic for releases. r? `@pietroalbini`

…bini Remove git fetch from CI rust-lang#86623 added a call to `git fetch`, which is problematic for releases. r? ``@pietroalbini``

Remove git fetch from CI rust-lang#86623 added a call to `git fetch`, which is problematic for releases. r? `@pietroalbini`

GuillaumeGomez added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Jun 25, 2021

rust-highfive assigned Mark-Simulacrum Jun 25, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 25, 2021

This comment has been minimized.
Sign in to view

GuillaumeGomez force-pushed the prevent-explanation-removal branch from 57833d6 to 820dd02Compare June 25, 2021 14:16

nagisa reviewed Jun 25, 2021
View reviewed changes

Comment threadsrc/ci/scripts/should-skip-this.sh Outdated

GuillaumeGomez force-pushed the prevent-explanation-removal branch 2 times, most recently from f83a7f3 to bc0aa3fCompare June 26, 2021 08:57

Mark-Simulacrum reviewed Jun 28, 2021
View reviewed changes

Comment threadsrc/ci/scripts/should-skip-this.sh Outdated

GuillaumeGomez force-pushed the prevent-explanation-removal branch from bc0aa3f to 685915cCompare June 28, 2021 15:33

Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 28, 2021

GuillaumeGomez force-pushed the prevent-explanation-removal branch from 685915c to 5a6d8f1Compare June 28, 2021 15:53

This comment has been minimized.
Sign in to view

GuillaumeGomez force-pushed the prevent-explanation-removal branch from 5a6d8f1 to 6efe8c6Compare June 28, 2021 15:55

GuillaumeGomez added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 28, 2021

This comment has been minimized.
Sign in to view

GuillaumeGomez force-pushed the prevent-explanation-removal branch from 6efe8c6 to dd5995dCompare June 28, 2021 16:13

Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 28, 2021

bjorn3 reviewed Jun 29, 2021
View reviewed changes

Comment threadsrc/ci/docker/host-x86_64/mingw-check/validate-error-codes.sh Outdated

GuillaumeGomez force-pushed the prevent-explanation-removal branch 2 times, most recently from c069f7e to 8819021Compare June 29, 2021 13:23

This comment has been minimized.
Sign in to view

Add check to ensure error code explanations are not removed anymore e…
13bdc5c
…ven if not emitted

GuillaumeGomez force-pushed the prevent-explanation-removal branch from 95be4f9 to 13bdc5cCompare July 2, 2021 13:08

GuillaumeGomez added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 2, 2021

Mark-Simulacrum reviewed Jul 2, 2021
View reviewed changes

Comment threadsrc/ci/scripts/should-skip-this.sh Outdated
Comment threadsrc/ci/docker/run.sh Outdated

This comment has been minimized.
Sign in to view

Only run error code explanation removal check if on CI
d6962ff

GuillaumeGomez force-pushed the prevent-explanation-removal branch from 24ce2b5 to d6962ffCompare July 2, 2021 23:01

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 Jul 4, 2021

JohnTitor mentioned this pull request Jul 4, 2021
Rollup of 8 pull requests #86875
Merged

bors merged commit ac880e5 into rust-lang:masterJul 5, 2021

rustbot added this to the 1.55.0 milestone Jul 5, 2021

GuillaumeGomez deleted the prevent-explanation-removal branch July 5, 2021 08:10

emilyalbini mentioned this pull request Jul 28, 2021
Prepare beta 1.55.0 #87508
Merged

GuillaumeGomez mentioned this pull request Aug 5, 2021
Remove git fetch from CI #87792
Merged

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 15, 2021
Auto merge ofrust-lang#87792- GuillaumeGomez:ci-fetch, r=pietroalbini
c0490a2
Remove git fetch from CI rust-lang#86623 added a call to `git fetch`, which is problematic for releases. r? `@pietroalbini`

Uh oh!

Uh oh!

Conversation

GuillaumeGomez commented Jun 25, 2021

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

GuillaumeGomez commented Jun 28, 2021

Uh oh!

Mark-Simulacrum commented Jun 28, 2021

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Jun 28, 2021

Uh oh!

This comment has been minimized.

Mark-Simulacrum commented Jun 28, 2021

Uh oh!

GuillaumeGomez commented Jun 28, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mark-Simulacrum commented Jun 28, 2021

Uh oh!

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Jul 2, 2021

Uh oh!

GuillaumeGomez commented Jul 2, 2021

Uh oh!

Uh oh!

Uh oh!

GuillaumeGomez commented Jul 2, 2021

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Jul 3, 2021

Uh oh!

Mark-Simulacrum commented Jul 4, 2021

Uh oh!

bors commented Jul 4, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

GuillaumeGomez commented Jun 28, 2021•
edited
Loading