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 6 pull requests #61868

Merged
merged 13 commits into from
Jun 15, 2019
Merged

Rollup of 6 pull requests #61868

merged 13 commits into from
Jun 15, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 15, 2019

Successful merges:

Failed merges:

r? @ghost

davidtwco and others added 13 commits June 13, 2019 23:34
This commit extends the work in rust-lang#61698 to get the `DefId` of const
parameters from block that resolve to a const parameter (as well as
const parameters directly, as it was previously).
note some safety concerns of raw-ptr-to-ref casts
…expr-count-sequel, r=varkor

typeck: Fix ICE for blocks in repeat expr count.

Fixes rust-lang#61336 (again). This PR fixes an ICE that occured when a block expression resolving to a const generic was used for the count of an array repeat expression.

r? @varkor
…mbol-ops, r=petrochenkov

Remove some unnecessary symbol interner ops

* Don't gensym symbols that don't need to worry about colliding with other symbols
* Use symbol constants instead of interning string literals in a few places.
* Don't generate a module in `__register_diagnostic`

r? @petrochenkov
in which we decline to lint single-use lifetimes in `derive`d impls

Resolves rust-lang#53738.

r? @eddyb
Change `...` to `..=` where applicable

This is mainly to fix rust-lang#61816, but I decided to manually check a few thousand `...` throughout the code base to check for any other cases. I think I found a documentation bug in `src\libsyntax\ast.rs` where both `1..` and `1...` where mentioned. If there is internal support for both `1..` and `1..=` (that can exist before error handling gets to it), then I can add that back.
There were some other cases that look like `// struct Closure<'l0...'li, T0...Tj, CK, CS, U0...Uk> {`, `// <P0 as Trait<P1...Pn>>::Foo: 'a`, and `assert!(min <= max, "discriminant range is {}...{}", min, max);`, but I am not sure if I should change those.
There are a bunch of cases in the `/test/` directory that could be changed, but I presume I should just leave those be.
…s, r=Centril

Minor cosmetic improvements to accompany PR 61825

r? @Centril
@Centril
Copy link
Contributor Author

Centril commented Jun 15, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Jun 15, 2019

📌 Commit ab2d2f9 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 Jun 15, 2019
@bors
Copy link
Contributor

bors commented Jun 15, 2019

⌛ Testing commit ab2d2f9 with merge 7917669be7be55376fcb0c467b73baada4c6c9da...

@bors
Copy link
Contributor

bors commented Jun 15, 2019

💔 Test failed - checks-travis

@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 Jun 15, 2019
@rust-highfive
Copy link
Collaborator

The job test-various of your PR failed on Travis (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.
[01:45:20] test time::tests::system_time_elapsed ... ok
[01:45:20] test time::tests::system_time_math ... ok
[01:45:21] test thread::tests::test_park_timeout_unpark_called_other_thread ... ok
[01:45:28] test sync::mpsc::tests::stress_recv_timeout_two_threads ... ok
[01:46:18] test process::tests::uid_to_root_fails ... test process::tests::uid_to_root_fails has been running for over 60 seconds
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

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)

@Centril
Copy link
Contributor Author

Centril commented Jun 15, 2019

@bors retry spurious 30 min

@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 Jun 15, 2019
@bors
Copy link
Contributor

bors commented Jun 15, 2019

⌛ Testing commit ab2d2f9 with merge bb16e72...

bors added a commit that referenced this pull request Jun 15, 2019
Rollup of 6 pull requests

Successful merges:

 - #61785 (note some safety concerns of raw-ptr-to-ref casts)
 - #61805 (typeck: Fix ICE for blocks in repeat expr count.)
 - #61813 (Remove some unnecessary symbol interner ops)
 - #61824 (in which we decline to lint single-use lifetimes in `derive`d impls)
 - #61844 (Change `...` to `..=` where applicable)
 - #61854 (Minor cosmetic improvements to accompany PR 61825)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jun 15, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing bb16e72 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 15, 2019
@bors bors mentioned this pull request Jun 15, 2019
@bors bors merged commit ab2d2f9 into rust-lang:master Jun 15, 2019
@Centril Centril deleted the rollup-gglsecp branch June 15, 2019 21:16
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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.

9 participants