Skip to content

Rollup of 5 pull requests #69325

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 26 commits into from
Feb 20, 2020
Merged

Rollup of 5 pull requests #69325

merged 26 commits into from
Feb 20, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Feb 20, 2020

Successful merges:

Failed merges:

r? @ghost

estebank and others added 26 commits February 11, 2020 12:42
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
We already have a structured suggestion, but the wording made it seem
like that wasn't the case.
Fix rust-lang#65286. r? @varkor
…enkov

On mismatched argument count point at arguments
Unify and improve const-prop lints

Add a single helper method for all lints emitted by const-prop, and make that lint different from the CTFE `const_err` lint. Also consistently check overflow on *arithmetic*, not on the assertion, to make behavior the same for debug and release builds.

See [this summary comment](rust-lang#69185 (comment)) for details and the latest status.

In terms of lint formatting, I went for what seems to be the better style: have a general message above the code, and then a specific message at the span:
```
error: this arithmetic operation will overflow
  --> $DIR/const-err2.rs:21:18
   |
LL |     let a_i128 = -std::i128::MIN;
   |                  ^^^^^^^^^^^^^^^ attempt to negate with overflow
```
We could also just have the specific message above and no text at the span if that is preferred.

I also converted some of the existing tests to use compiletest revisions, so that the same test can check a bunch of different compile flags.

Fixes rust-lang#69020.
Helps with rust-lang#69021: debug/release are now consistent, but the assoc-const test in that issue still fails (there is a FIXME in the PR for this). The reason seems to be that const-prop notices the assoc const in `T::N << 42` and does not even bother calling `const_prop` on that operation.
Has no effect on rust-lang#61821; the duplication there has entirely different reasons.
Tweak binding lifetime suggestion text

We already have a structured suggestion, but the wording made it seem like that wasn't the case.

Fix rust-lang#65286. r? @varkor
@Centril
Copy link
Contributor Author

Centril commented Feb 20, 2020

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Feb 20, 2020

📌 Commit c1165ce has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 20, 2020
@Centril Centril added the rollup A PR which is a rollup label Feb 20, 2020
@bors
Copy link
Collaborator

bors commented Feb 20, 2020

⌛ Testing commit c1165ce with merge 2c462a2...

@bors
Copy link
Collaborator

bors commented Feb 20, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 2c462a2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 20, 2020
@bors bors merged commit 2c462a2 into rust-lang:master Feb 20, 2020
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #69325!

Tested on commit 2c462a2.
Direct link to PR: #69325

💔 clippy-driver on windows: test-pass → test-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
💔 reference on windows: test-pass → test-fail (cc @matthewjasper @Havvy @steveklabnik @ehuss, @rust-lang/infra).
💔 reference on linux: test-pass → test-fail (cc @matthewjasper @Havvy @steveklabnik @ehuss, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Feb 20, 2020
Tested on commit rust-lang/rust@2c462a2.
Direct link to PR: <rust-lang/rust#69325>

💔 clippy-driver on windows: test-pass → test-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
💔 reference on windows: test-pass → test-fail (cc @matthewjasper @Havvy @steveklabnik @ehuss, @rust-lang/infra).
💔 reference on linux: test-pass → test-fail (cc @matthewjasper @Havvy @steveklabnik @ehuss, @rust-lang/infra).
@Centril Centril deleted the rollup-vce2ko2 branch February 20, 2020 22:47
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Feb 20, 2020
bors added a commit to rust-lang/rust-clippy that referenced this pull request Feb 20, 2020
bors added a commit that referenced this pull request Feb 21, 2020
Update Clippy from 2855b21 to 8fbb23f

```
Fix ICE in `missing_errors_doc`
Update License
Migrate Clippy to GitHub Actions
redundant_clone: Migrate to new dataflow framework
Move unneeded_field_pattern to pedantic group
Rustup to #69325
Rustup to #69072
```

Fixes #69338

r? @Manishearth
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants