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

Rollup of 8 pull requests #67853

Merged
merged 25 commits into from
Jan 4, 2020
Merged

Rollup of 8 pull requests #67853

merged 25 commits into from
Jan 4, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jan 4, 2020

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 25 commits December 22, 2019 18:37
The test checks that we reuse the CGU of a crate when the implementation
details of an `extern crate` have changed.

Signed-off-by: Michal Terepeta <michal.terepeta@gmail.com>
linkchecker is no longer run on the compiler docs so they can be removed from the whitelist.
Suggest calling method when first argument is `self`

Closes: rust-lang#66782

I've explored different approaches for this MR but I think the most straightforward is the best one.

I've tried to find out if the methods for given type exist (to maybe have a better suggestion), but we don't collect them anywhere and collecting them is quite problematic. Moreover, collecting all the methods would require rewriting big part of the code and also could potentially include performance degradation, which I don't think is necessary for this simple case.
…akis

no longer promote non-pattern const functions

This is trying to pack-pedal a bit on promotion feature creep, as proposed by @eddyb [here](rust-lang/const-eval#19 (comment)): possibly, a sane subset of `const fn` that we could promote are those that are just constructors -- the same subset that we might want to allow in pattern position at some point.

So, this removes the `rustc_promotable` attribute from the three functions they identified that do not fit this pattern. The first step is to run crater to see if there is code in the wild that relies on this being promotable.

r? @oli-obk
…sakis

Add a test for rust-lang#37333

The test checks that we reuse the CGU of a crate when the implementation
details of an `extern crate` have changed.

Signed-off-by: Michal Terepeta <michal.terepeta@gmail.com>
Nix reexports from `rustc_span` in `syntax`

Remove reexports `syntax::{source_map, symbol, edition}` and use `rustc_span` paths directly.

r? @petrochenkov
…komatsakis

Cleanup linkchecker whitelist

linkchecker is no longer run on the compiler docs so they can be removed from the whitelist.
…r=Manishearth

Implement uncommon_codepoints lint.

Part of rust-lang#55467 .  The checks of `$crate` and `{{root}}` are very unfortunate. But i'm not sure where they belongs to.
tweak wording of mismatched delimiter errors

This PR improves the wording of the "incorrect delimiter" error messages. Here's a quick rationale:

- *"un-closed" -> "unclosed"*: "unclosed" is valid English, so there's no need to hyphenate the prefix. This should be pretty uncontroversial, I think.
- *"close delimiter" -> "closing delimiter"*: In my anecdotal experience, I've always heard "closing delimiter" or "closing parenthesis". In addition, the codebase already uses this terminology in comments and function names more than "close delimiter", which could indicate that it's more intuitive.
- "incorrect delimiter" -> "mismatched delimiter": "Incorrect delimiter" is vague; why is it incorrect? "mismatched" clearly indicates why the delimiter is causing the error.

r? @estebank
@Centril Centril added the rollup A PR which is a rollup label Jan 4, 2020
@Centril
Copy link
Contributor Author

Centril commented Jan 4, 2020

@bors r+ p=8 rollup=never

@bors
Copy link
Contributor

bors commented Jan 4, 2020

📌 Commit 745f771 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 Jan 4, 2020
@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 Jan 4, 2020
@bors
Copy link
Contributor

bors commented Jan 4, 2020

⌛ Testing commit 745f771 with merge abf2e00...

bors added a commit that referenced this pull request Jan 4, 2020
Rollup of 8 pull requests

Successful merges:

 - #66913 (Suggest calling method when first argument is `self`)
 - #67531 (no longer promote non-pattern const functions)
 - #67773 (Add a test for #37333)
 - #67786 (Nix reexports from `rustc_span` in `syntax`)
 - #67789 (Cleanup linkchecker whitelist)
 - #67810 (Implement uncommon_codepoints lint.)
 - #67835 (tweak wording of mismatched delimiter errors)
 - #67845 (Also remove const-hack for abs)

Failed merges:

r? @ghost
@rust-highfive
Copy link
Collaborator

The job i686-mingw-1 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.
2020-01-04T02:36:40.9462925Z do so (now or later) by using -b with the checkout command again. Example:
2020-01-04T02:36:40.9463305Z 
2020-01-04T02:36:40.9463493Z   git checkout -b <new-branch-name>
2020-01-04T02:36:40.9463630Z 
2020-01-04T02:36:40.9463773Z HEAD is now at b23243dfe Auto merge of #67853 - Centril:rollup-sx5zi9n, r=Centril
2020-01-04T02:36:40.9841919Z ##[section]Starting: Setup environment
2020-01-04T02:36:40.9953792Z ==============================================================================
2020-01-04T02:36:40.9953890Z Task         : Bash
2020-01-04T02:36:40.9953959Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2020-01-04T04:35:33.6919651Z 
2020-01-04T04:35:33.6920279Z 
2020-01-04T04:35:33.7676341Z failed to run: D:\a\1\s\build\bootstrap\debug\bootstrap test --exclude src/test/ui --exclude src/test/compile-fail
2020-01-04T04:35:33.7677086Z Build completed unsuccessfully in 1:48:34
2020-01-04T04:35:33.8233806Z make: *** [Makefile:89: ci-mingw-subset-1] Error 1
2020-01-04T04:35:33.9022986Z   local time: Sat Jan  4 04:35:33 CUT 2020
2020-01-04T04:35:34.3098838Z   network time: Sat, 04 Jan 2020 04:35:34 GMT
2020-01-04T04:35:34.3101742Z == end clock drift check ==
2020-01-04T04:35:34.3834320Z 
2020-01-04T04:35:34.3834320Z 
2020-01-04T04:35:34.7746249Z ##[error]Bash exited with code '2'.
2020-01-04T04:35:34.8121976Z ##[section]Starting: Checkout
2020-01-04T04:35:34.9044403Z ==============================================================================
2020-01-04T04:35:34.9044563Z Task         : Get sources
2020-01-04T04:35:34.9044653Z 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)

@bors
Copy link
Contributor

bors commented Jan 4, 2020

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

@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #67853!

Tested on commit abf2e00.
Direct link to PR: #67853

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 4, 2020
Tested on commit rust-lang/rust@abf2e00.
Direct link to PR: <rust-lang/rust#67853>

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq, @rust-lang/infra).
💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung, @rust-lang/infra).
phansch added a commit to phansch/rust-clippy that referenced this pull request Jan 4, 2020
phansch added a commit to phansch/rust-clippy that referenced this pull request Jan 4, 2020
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jan 4, 2020
@Centril Centril deleted the rollup-sx5zi9n branch January 4, 2020 15:31
matthiaskrgr added a commit to matthiaskrgr/rls that referenced this pull request Jan 4, 2020
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 4, 2020
Changes:
````
rustup rust-lang#67853
deps: update clippy
Update Clippy
Update cargo.
Correct two links to the json-error-emitter
````

Fixes rust-lang#67708
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.