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

Clean up diagnostics for arithmetic operation errors #76754

Merged
merged 7 commits into from
Sep 29, 2020

Conversation

varkor
Copy link
Member

@varkor varkor commented Sep 15, 2020

Plus a small tweak to a range pattern error message.

@rust-highfive
Copy link
Collaborator

r? @ecstatic-morse

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 15, 2020
@jyn514 jyn514 added A-diagnostics Area: Messages for errors, warnings, and lints T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 16, 2020
@ecstatic-morse
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 16, 2020

📌 Commit 220cb278997079087ed3b3ed6e73d60d80d770d7 has been approved by ecstatic-morse

@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 Sep 16, 2020
@bors
Copy link
Contributor

bors commented Sep 18, 2020

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

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 18, 2020
@varkor
Copy link
Member Author

varkor commented Sep 18, 2020

@bors r=ecstatic-morse

@bors
Copy link
Contributor

bors commented Sep 18, 2020

📌 Commit e2e000a has been approved by ecstatic-morse

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 18, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 19, 2020
…tatic-morse

Clean up diagnostics for arithmetic operation errors

Plus a small tweak to a range pattern error message.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 19, 2020
…tatic-morse

Clean up diagnostics for arithmetic operation errors

Plus a small tweak to a range pattern error message.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 20, 2020
…tatic-morse

Clean up diagnostics for arithmetic operation errors

Plus a small tweak to a range pattern error message.
@jyn514
Copy link
Member

jyn514 commented Sep 20, 2020

Failed in rollup (#76951):

 ---- [ui] ui/lint/lint-exceeding-bitshifts.rs#opt stdout ----
diff of stderr:

140	  --> $DIR/lint-exceeding-bitshifts.rs:77:15
141	   |
142	LL |       let n = 1_isize << BITS;
-	   |               ^^^^^^^^^^^^^^^ attempt to shift left by `64_usize`, which would overflow
+	   |               ^^^^^^^^^^^^^^^ attempt to shift left by `32_usize`, which would overflow
144	
145	warning: this arithmetic operation will overflow
146	  --> $DIR/lint-exceeding-bitshifts.rs:78:15

147	   |
148	LL |       let n = 1_usize << BITS;
-	   |               ^^^^^^^^^^^^^^^ attempt to shift left by `64_usize`, which would overflow
+	   |               ^^^^^^^^^^^^^^^ attempt to shift left by `32_usize`, which would overflow
150	
151	warning: 24 warnings emitted

Looks like you might need to normalize the size of BITS in the diagnostic?

@jyn514
Copy link
Member

jyn514 commented Sep 20, 2020

@bors r-

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 20, 2020
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 27, 2020
@jyn514
Copy link
Member

jyn514 commented Sep 27, 2020

Looks spurious:

Run src/ci/scripts/install-clang.sh
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0  424M    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  1  424M    1 6779k    0     0  4627k      0  0:01:33  0:00:01  0:01:32 4624k
  3  424M    3 12.8M    0     0  6190k      0  0:01:10  0:00:02  0:01:08 6190k
curl: (56) SSLRead() return error -9806
clang+llvm-10.0.0-x86_64-apple-darwin/lib/libLLVMCore.a: Lzma library error:  No progress is possible

@bors retry

@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 Sep 27, 2020
@bors
Copy link
Contributor

bors commented Sep 28, 2020

⌛ Testing commit 5851d62 with merge 9e0179acfb7ebbc6a8d2d2b41ec3423bb266fa7b...

@bors
Copy link
Contributor

bors commented Sep 28, 2020

💔 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 Sep 28, 2020
@jyn514
Copy link
Member

jyn514 commented Sep 28, 2020

You need to bless the fulldeps tests:


failures:
    [run-make] run-make-fulldeps/instrument-coverage-mir-cov-html-base
    [run-make] run-make-fulldeps/instrument-coverage-mir-cov-html-link-dead-code

@varkor
Copy link
Member Author

varkor commented Sep 28, 2020

I addressed the fulldeps, but unfortunately I couldn't run the entire test suite on my computer (it's been acting up lately), so I'm not certain there isn't another issue. Hopefully that's the last of them.

@bors r=ecstatic-morse

@bors
Copy link
Contributor

bors commented Sep 28, 2020

📌 Commit c0b1057 has been approved by ecstatic-morse

@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 Sep 28, 2020
@bors
Copy link
Contributor

bors commented Sep 29, 2020

⌛ Testing commit c0b1057 with merge 1ddb2bfd14764732f023ef2edbc94525e91402a1...

@bors
Copy link
Contributor

bors commented Sep 29, 2020

💥 Test timed out

@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 Sep 29, 2020
@jyn514
Copy link
Member

jyn514 commented Sep 29, 2020

@bors retry

@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 Sep 29, 2020
@bors
Copy link
Contributor

bors commented Sep 29, 2020

⌛ Testing commit c0b1057 with merge 4d52dc4...

@bors
Copy link
Contributor

bors commented Sep 29, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: ecstatic-morse
Pushing 4d52dc4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 29, 2020
@bors bors merged commit 4d52dc4 into rust-lang:master Sep 29, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 29, 2020
@varkor varkor deleted the diagnostic-cleanup-ii branch September 29, 2020 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-diagnostics Area: Messages for errors, warnings, and lints merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

6 participants