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.

Sign up for GitHub

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

Jump to bottom

Rollup of 4 pull requests #71111

Merged
merged 18 commits into from
Apr 14, 2020
Merged

Rollup of 4 pull requests #71111

merged 18 commits into from
Apr 14, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

oli-obk and others added 18 commits April 1, 2020 14:36
@oli-obk
Explain how to work with subrepos
04c8191
@oli-obk
s/subrepo/subtree/
56d0c81
@oli-obk
Git subtree is upstream, no need to install
521eb0d
@oli-obk
Explain that you have to specify path and repository during subrepo s…
af55352 
…ynchronizations
@oli-obk
Triple backticks
59cfb80
@oli-obk
Address review comments
df91b40
@oli-obk
Address reviews
7928c45
@marmeladema
Remove useless calls to `assemble_extension_candidates_for_traits_in_…
795fa0a 
…scope`

Calls to `assemble_extension_candidates_for_traits_in_scope` with
`DUMMY_HIR_ID` as `expr_hir_id` are useless because the first thing
that this function does is to return `Ok(())` in this case.
@marmeladema
Remove usage of DUMMY_HIR_ID in some visitors
830e4fd
@marmeladema
Just unwrap() instead of unwrap_or(DUMMY_HIR_ID).
95fb7bf 
A valid hir id should always be returned in this case.
@marmeladema
Use CRATE_HIR_ID instead of DUMMY_HIR_ID when appropriate.
e08ad7a 
Those usage ends up forwarded to a `ObligationClause` which uses
`CRATE_HIR_ID` for dummy value as seen in `ObligationClause::dummy`.
@samrat
Add test case for type aliasing impl Sized
38bfba6
@marmeladema
Remove usage of DUMMY_HIR_ID in FnCtxt::get_conversion_methods
d0409ea
@lcnr
allow const generics in const fn
50eb397
@Dylan-DPC
Rollup merge of rust-lang#70654 - oli-obk:subrepo_docs, r=Mark-Simula…
048c842 
…crum

Explain how to work with subtree

cc rust-lang#70651

r? @Centril @RalfJung

This PR just contains the usage documentation, we'll do actual moves in later PRs
@Dylan-DPC
Rollup merge of rust-lang#71092 - marmeladema:dummy-hir-id-removal, r…
9de2a79 
…=eddyb

Remove some usage of `DUMMY_HIR_ID`
@Dylan-DPC
Rollup merge of rust-lang#71103 - samrat:tait-sized, r=estebank
e261ef0 
Add test case for type aliasing `impl Sized`

Fixes rust-lang#71085
@Dylan-DPC
Rollup merge of rust-lang#71109 - lcnr:generics_in_const_fn, r=eddyb
dd27462 
allow const generics in const fn

This was explicitly forbidden before. As we were unable to think of a reason
why this should still be the case, this check has been removed.

r? @eddyb
cc @varkor @Centril
@Dylan-DPC-zz
Copy link
Author

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Apr 13, 2020

📌 Commit dd27462 has been approved by Dylan-DPC

@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 Apr 13, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Apr 13, 2020
@bors
Copy link
Contributor

bors commented Apr 13, 2020

⌛ Testing commit dd27462 with merge 47f4969...

@bors
Copy link
Contributor

bors commented Apr 14, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 47f4969 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 14, 2020
@bors bors merged commit 47f4969 into rust-lang:master Apr 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Dylan-DPC-zz @bors @oli-obk @marmeladema @samrat @lcnr @Dylan-DPC