Rollup of 6 pull requests by Centril · Pull Request #61868 · rust-lang/rust

Centril · 2019-06-15T15:45:09Z

Successful merges:

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

Failed merges:

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).

Resolvesrust-lang#53738.

note some safety concerns of raw-ptr-to-ref casts

@varkor

…expr-count-sequel, r=varkor typeck: Fix ICE for blocks in repeat expr count. Fixesrust-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

@petrochenkov

…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

@eddyb

in which we decline to lint single-use lifetimes in `derive`d impls Resolvesrust-lang#53738. r? @eddyb

Change `...` to `..=` where applicable This is mainly to fixrust-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.

@Centril

…s, r=Centril Minor cosmetic improvements to accompany PR 61825 r? @Centril

Centril · 2019-06-15T15:45:27Z

@bors r+ p=6 rollup=never

bors · 2019-06-15T15:45:28Z

📌 Commit ab2d2f9 has been approved by Centril

bors · 2019-06-15T16:02:18Z

⌛ Testing commit ab2d2f9 with merge 7917669be7be55376fcb0c467b73baada4c6c9da...

bors · 2019-06-15T18:22:04Z

💔 Test failed - checks-travis

rust-highfive · 2019-06-15T18:22:06Z

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 · 2019-06-15T18:24:01Z

@bors retry spurious 30 min

bors · 2019-06-15T18:24:25Z

⌛ Testing commit ab2d2f9 with merge bb16e72...

@ghost

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 · 2019-06-15T21:15:23Z

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

davidtwcoand others added 13 commits June 13, 2019 23:34

typeck: Fix ICE for blocks in repeat expr count.
bc36aab
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).

in which we decline to lint single-use lifetimes in derived impls
17653dd
Resolvesrust-lang#53738.

note some safety concerns of raw-ptr-to-ref casts
00bae87

Change ... to ..= where applicable
363940b

Avoid some unnecessary symbol interner operations
4e212c6

Use sym constansts for PrimitiveTypeTable keys
5c84cd3

Minor cosmetic improvements to accompany PR 61825
926408c

Rollup merge ofrust-lang#61785- RalfJung:as-ref, r=rkruppe
1b95e02
note some safety concerns of raw-ptr-to-ref casts

Rollup merge ofrust-lang#61824- rust-lang:single_derive, r=eddyb
eb188f1
in which we decline to lint single-use lifetimes in `derive`d impls Resolvesrust-lang#53738. r? @eddyb

Rollup merge ofrust-lang#61854- alexreg:fix-type-alias-enum-pattern…
ab2d2f9
…s, r=Centril Minor cosmetic improvements to accompany PR 61825 r? @Centril

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 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

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 added the merged-by-bors This PR was explicitly merged by bors. label Jun 15, 2019

bors mentioned this pull request Jun 15, 2019
Allocate HIR on an arena #57173
Closed

bors merged commit ab2d2f9 into rust-lang:masterJun 15, 2019

Centril deleted the rollup-gglsecp branch June 15, 2019 21:16

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Navigation Menu

Uh oh!

Uh oh!

Rollup of 6 pull requests - #61868

Rollup of 6 pull requests#61868
bors merged 13 commits into
rust-lang:masterfrom
Centril:rollup-gglsecp

Centril commented Jun 15, 2019

Uh oh!

Centril commented Jun 15, 2019

Uh oh!

bors commented Jun 15, 2019

Uh oh!

bors commented Jun 15, 2019

Uh oh!

bors commented Jun 15, 2019

Uh oh!

rust-highfive commented Jun 15, 2019

Uh oh!

Centril commented Jun 15, 2019

Uh oh!

bors commented Jun 15, 2019

Uh oh!

bors commented Jun 15, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Uh oh!

Conversation

Centril commented Jun 15, 2019

Uh oh!

Centril commented Jun 15, 2019

Uh oh!

bors commented Jun 15, 2019

Uh oh!

bors commented Jun 15, 2019

Uh oh!

bors commented Jun 15, 2019

Uh oh!

rust-highfive commented Jun 15, 2019

Uh oh!

Centril commented Jun 15, 2019

Uh oh!

bors commented Jun 15, 2019

Uh oh!

bors commented Jun 15, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants