Skip to content

Rollup of 10 pull requests - #61850

Closed
Centril wants to merge 29 commits into
rust-lang:masterfrom
Centril:rollup-031fj0d
Closed

Rollup of 10 pull requests#61850
Centril wants to merge 29 commits into
rust-lang:masterfrom
Centril:rollup-031fj0d

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

JohnTitorand others added 29 commits June 12, 2019 20: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).
Limit dylib symbols
This makes `windows-gnu` match the behavior of `windows-msvc`. It probably doesn't make sense to export these symbols on other platforms either.
…tsakis
Updates smallvec and new_debug_unreachable
The version `0.6.10` of smallvec has released that fixes an [ICE](rust-lang#61549).
This is re-submission of rust-lang#58773.
And this may let rust-lang#56440 re-start.
…=oli-obk
prepare for Intptrcast model
rust-lang#61668 done right (I hope so). r? @RalfJung@oli-obk
note some safety concerns of raw-ptr-to-ref casts
…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
…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
Resolvesrust-lang#53738.
r? @eddyb
type_alias_enum_variants: fixrust-lang#61801; allow a path pattern to infer
Fixrust-lang#61801.
Given a type-relative path pattern referring to an enum variant through a type alias, allow inferring the generic argument applied in the expectation set by the scrutinee of a `match` expression.
Similar issues may exist for `let` statements but I don't know how to test for that since `PhantomData<T>` is necessary...)
The gist of the problem here was that `resolve_ty_and_res_ufcs` was called twice which is apparently no good... It is possible that this PR is papering over some deeper problem, but that is beyond my knowledge of the compiler.
r? @petrochenkov
cc @eddyb@alexreg
cc rust-lang#61682
cc rust-lang#49683
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

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=10 rollup=never

@bors

bors commented Jun 14, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 1df29d7 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 14, 2019
@bors

bors commented Jun 14, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1df29d7 with merge 9e018c0af9f630c99f79357d4ea798424200dc64...

@bors

bors commented Jun 14, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors 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 14, 2019
@CentrilCentril closed this Jun 14, 2019
@Centril
Centril deleted the rollup-031fj0d branch June 14, 2019 21:17
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

#![feature(type_alias_enum_variants)]: Unit variant pattern through a type alias to generic enum requires type annotations

11 participants

@Centril@bors@JohnTitor@pvdrz@Zoxc@davidtwco@estebank@zackmdavis@RalfJung@AaronKutch@matthewjasper