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 5 pull requests #61799

Merged
merged 10 commits into from
Jun 13, 2019
Merged

Rollup of 5 pull requests #61799

merged 10 commits into from
Jun 13, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 13, 2019

Successful merges:

Failed merges:

r? @ghost

alexcrichton and others added 10 commits June 10, 2019 10:58
This is duplicated in a few locations throughout the sysroot to work
around issues with not exporting a macro in libstd but still wanting it
available to sysroot crates to define blocks. Nowadays though we can
simply depend on the `cfg-if` crate on crates.io, allowing us to use it
from there!
Once::new() has been a stable const fn for a while now.

Closes rust-lang#61746
Changes:
````
Fix wrong lifetime of TyCtxt
travis: Wait at most 30 minutes for base test
Typos and minor grammar corrections
Adds lint for integer division
redundant_closure_for_method_calls fixes: lint does not trigger when there is a difference in mutability lint does not trigger when the method belongs to a trait which is not implemebted directly (Deref)
Fix implicit_return docs
rustup https://github.com/rust-lang/rust/pull/61758/files
Remove wrong lifetime from LintContext
Workaround for rust-lang/rustfmt#3615
Fixing eta with respect to lazy evaluation.
````
Handle index out of bound errors during const eval without panic

Fix rust-lang#61595
…fackler

std: Remove internal definitions of `cfg_if!` macro

This is duplicated in a few locations throughout the sysroot to work
around issues with not exporting a macro in libstd but still wanting it
available to sysroot crates to define blocks. Nowadays though we can
simply depend on the `cfg-if` crate on crates.io, allowing us to use it
from there!
…xcrichton

Deprecate ONCE_INIT in future 1.38 release

Once::new() has been a stable const fn for a while now.

Closes rust-lang#61746
submodules: update clippy from c0dbd34 to bd33a97

Changes:
````
Fix implicit_return docs
rustup https://github.com/rust-lang/rust/pull/61758/files
Remove wrong lifetime from LintContext
Workaround for rust-lang/rustfmt#3615
Fixing eta with respect to lazy evaluation.
````
r? @oli-obk
…etrochenkov

Small cleanup in `check_pat_path`
@Centril
Copy link
Contributor Author

Centril commented Jun 13, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Jun 13, 2019

📌 Commit 8917b8e 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 13, 2019
@bors
Copy link
Contributor

bors commented Jun 13, 2019

⌛ Testing commit 8917b8e with merge 57a3300...

bors added a commit that referenced this pull request Jun 13, 2019
Rollup of 5 pull requests

Successful merges:

 - #61598 (Handle index out of bound errors during const eval without panic)
 - #61720 (std: Remove internal definitions of `cfg_if!` macro)
 - #61757 (Deprecate ONCE_INIT in future 1.38 release)
 - #61766 (submodules: update clippy from c0dbd34 to bd33a97)
 - #61791 (Small cleanup in `check_pat_path`)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jun 13, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 13, 2019
@bors bors merged commit 8917b8e into rust-lang:master Jun 13, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #61799!

Tested on commit 57a3300.
Direct link to PR: #61799

🎉 clippy-driver on windows: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 13, 2019
Tested on commit rust-lang/rust@57a3300.
Direct link to PR: <rust-lang/rust#61799>

🎉 clippy-driver on windows: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
@Centril Centril deleted the rollup-vpm5uxr branch June 13, 2019 15:48
@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.

None yet

7 participants