Skip to content

Rollup of 8 pull requests #67532

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 21 commits into from
Dec 22, 2019
Merged

Rollup of 8 pull requests #67532

merged 21 commits into from
Dec 22, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 22, 2019

Successful merges:

Failed merges:

r? @ghost

pvdrz and others added 21 commits December 14, 2019 12:13
The contents of this file have been moved in rust-lang#56932 (520e8b0) and the
file should have been removed as well.
When moving the script out of CI configuration and into a proper script
we lost track of the current directory changing (and as such the
parameters of the script needing to be different now).
…r=oli-obk

Add simpler entry points to const eval for common usages.

I found the `tcx.const_eval` API to be complex/awkward to work with, because of the inherent complexity from all of the different situations it is called from. Though it mainly used in one of the following ways:
- Evaluates the value of a constant without any substitutions, e.g. evaluating a static, discriminant, etc.
- Evaluates the value of a resolved instance of a constant. this happens when evaluating unevaluated constants or normalising trait constants.
- Evaluates a promoted constant.

This PR adds three new functions `const_eval_mono`, `const_eval_resolve`, and `const_eval_promoted` to `TyCtxt`, which each cater to one of the three ways `tcx.const_eval`
 is normally used.
… r=RalfJung

Add `ImmTy::try_from_(u)int` methods

r? @RalfJung
…emoval, r=Centril

Rustdoc mutability removal

Fixes rust-lang#67470.

As discussed in another PR, the `clean::Mutability` type in rustdoc is useless. So let's remove it!

r? @Centril
…-DPC

Remove iter_private.rs

The contents of this file have been moved in rust-lang#56932 (520e8b0) and the file should have been removed as well.
Fix typo in path parser name

It appears that a little typo crept into the name of a path parsing method.
Document why Any is not an unsafe trait

The added documentation is not public (i.e., not in a doc comment) but that seems appropriate for this sort of low-level detail.

Fixes rust-lang#62303
…r, r=Centril

Utilize rust-lang/rust commit hashes in toolstate

When moving the script out of CI configuration and into a proper script
we lost track of the current directory changing (and as such the
parameters of the script needing to be different now).
@Centril
Copy link
Contributor Author

Centril commented Dec 22, 2019

@bors r+ p=200 rollup=never

@bors
Copy link
Collaborator

bors commented Dec 22, 2019

📌 Commit 9c5b73e has been approved by Centril

@bors
Copy link
Collaborator

bors commented Dec 22, 2019

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@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 Dec 22, 2019
@Centril Centril added the rollup A PR which is a rollup label Dec 22, 2019
@bors
Copy link
Collaborator

bors commented Dec 22, 2019

⌛ Testing commit 9c5b73e with merge 9b98af8...

bors added a commit that referenced this pull request Dec 22, 2019
Rollup of 8 pull requests

Successful merges:

 - #66877 (Add simpler entry points to const eval for common usages.)
 - #67299 (Add `ImmTy::try_from_(u)int` methods)
 - #67487 (Rustdoc mutability removal)
 - #67499 (Misc MIR building cleanups)
 - #67506 (Remove iter_private.rs)
 - #67508 (Fix typo in path parser name)
 - #67519 (Document why Any is not an unsafe trait)
 - #67525 (Utilize rust-lang/rust commit hashes in toolstate)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Dec 22, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 22, 2019
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #67532!

Tested on commit 9b98af8.
Direct link to PR: #67532

💔 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).
🎉 rls on windows: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Dec 22, 2019
Tested on commit rust-lang/rust@9b98af8.
Direct link to PR: <rust-lang/rust#67532>

💔 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).
🎉 rls on windows: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok, @rust-lang/infra).
💔 rustc-guide on linux: test-pass → test-fail (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).
@Centril Centril deleted the rollup-3duj42d branch December 22, 2019 22:48
# for free to join this conversation on GitHub. Already have an account? # 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