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

Add long error explanation for E0594 #66155

Merged
merged 3 commits into from
Nov 19, 2019
Merged

Add long error explanation for E0594 #66155

merged 3 commits into from
Nov 19, 2019

Conversation

GuillaumeGomez
Copy link
Member

Part of #61137.

r? @Dylan-DPC

@rust-highfive
Copy link
Collaborator

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 6, 2019
@GuillaumeGomez GuillaumeGomez mentioned this pull request Nov 7, 2019
Closed
100 tasks
Dylan-DPC-zz
Dylan-DPC-zz reviewed Nov 11, 2019
View reviewed changes
src/librustc_mir/error_codes.rs Outdated
ss.earth = 2; // error!
```

To fix this error, just declare `ss` as mutable by using the `mut` keyword:
Copy link

Choose a reason for hiding this comment

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

Suggested change
To fix this error, just declare `ss` as mutable by using the `mut` keyword:
To fix this error, declare `ss` as mutable by using the `mut` keyword:

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks! I'll update once the error codes have been moved.

@bors
Copy link
Contributor

bors commented Nov 14, 2019

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

@GuillaumeGomez GuillaumeGomez force-pushed the long-err-explanation-E0594 branch from 046d4b8 to fae8480 Compare November 18, 2019 18:03
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2019-11-18T18:04:38.6373339Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-18T18:04:38.6578076Z ##[command]git config gc.auto 0
2019-11-18T18:04:38.6657108Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-18T18:04:38.6721902Z ##[command]git config --get-all http.proxy
2019-11-18T18:04:39.3179459Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66155/merge:refs/remotes/pull/66155/merge
---
2019-11-18T18:11:04.2161013Z    Compiling serde_json v1.0.40
2019-11-18T18:11:06.0701168Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-11-18T18:11:17.7628291Z     Finished release [optimized] target(s) in 1m 31s
2019-11-18T18:11:17.7721260Z tidy check
2019-11-18T18:11:19.2419733Z tidy error: duplicate error code: 593
2019-11-18T18:11:19.2420589Z tidy error: /checkout/src/librustc_error_codes/error_codes.rs:320: E0593: include_str!("./error_codes/E0593.md"),
2019-11-18T18:11:19.2420977Z tidy error: /checkout/src/librustc_error_codes/error_codes.rs:321: E0593: include_str!("./error_codes/E0594.md"),
2019-11-18T18:11:20.6674390Z some tidy checks failed
2019-11-18T18:11:20.6674468Z Found 441 error codes
2019-11-18T18:11:20.6674550Z Found 0 error codes with no tests
2019-11-18T18:11:20.6674621Z Done!
2019-11-18T18:11:20.6674621Z Done!
2019-11-18T18:11:20.6674653Z 
2019-11-18T18:11:20.6674680Z 
2019-11-18T18:11:20.6675543Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-11-18T18:11:20.6675646Z 
2019-11-18T18:11:20.6675692Z 
2019-11-18T18:11:20.6678693Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-11-18T18:11:20.6678998Z Build completed unsuccessfully in 0:01:35
2019-11-18T18:11:20.6678998Z Build completed unsuccessfully in 0:01:35
2019-11-18T18:11:20.6732323Z == clock drift check ==
2019-11-18T18:11:20.6744182Z   local time: Mon Nov 18 18:11:20 UTC 2019
2019-11-18T18:11:20.9508226Z   network time: Mon, 18 Nov 2019 18:11:20 GMT
2019-11-18T18:11:20.9508918Z == end clock drift check ==
2019-11-18T18:11:22.3187591Z 
2019-11-18T18:11:22.3304308Z ##[error]Bash exited with code '1'.
2019-11-18T18:11:22.3353973Z ##[section]Starting: Checkout
2019-11-18T18:11:22.3355644Z ==============================================================================
2019-11-18T18:11:22.3355702Z Task         : Get sources
2019-11-18T18:11:22.3355766Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez GuillaumeGomez force-pushed the long-err-explanation-E0594 branch from fae8480 to c981c99 Compare November 18, 2019 22:38
@Dylan-DPC-zz
Copy link

And the ferris wheel continues to roll 🎡

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 19, 2019

📌 Commit c981c99 has been approved by Dylan-DPC

@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 19, 2019
Centril added a commit to Centril/rust that referenced this pull request Nov 19, 2019
@Centril
Rollup merge of rust-lang#66155 - GuillaumeGomez:long-err-explanation…
40deec8 
…-E0594, r=Dylan-DPC

Add long error explanation for E0594

Part of rust-lang#61137.

r? @Dylan-DPC
@Centril Centril mentioned this pull request Nov 19, 2019
Merged
bors added a commit that referenced this pull request Nov 19, 2019
@bors
Auto merge of #66545 - Centril:rollup-xv2rx7v, r=Centril
9d6ff15 
Rollup of 11 pull requests

Successful merges:

 - #66090 (Misc CI improvements)
 - #66155 (Add long error explanation for E0594)
 - #66239 (Suggest calling async closure when needed)
 - #66430 ([doc] Fix the source code highlighting on source comments)
 - #66431 (Fix 'type annotations needed' error with opaque types)
 - #66461 (Add explanation message for E0641)
 - #66493 (Add JohnTitor to rustc-guide toolstate notification list)
 - #66511 (std::error::Chain: remove Copy)
 - #66529 (resolve: Give derive helpers highest priority during resolution)
 - #66536 (Move the definition of `QueryResult` into `plumbing.rs`.)
 - #66538 (Remove compiler_builtins_lib feature from libstd)

Failed merges:

r? @ghost
@bors bors merged commit c981c99 into rust-lang:master Nov 19, 2019
@GuillaumeGomez GuillaumeGomez deleted the long-err-explanation-E0594 branch November 20, 2019 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dylan-DPC-zz Dylan-DPC-zz Dylan-DPC-zz left review comments

Assignees

@Dylan-DPC-zz Dylan-DPC-zz

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GuillaumeGomez @rust-highfive @bors @Dylan-DPC-zz