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 4 pull requests #61274

Merged
merged 15 commits into from
May 28, 2019
Merged

Rollup of 4 pull requests #61274

merged 15 commits into from
May 28, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 28, 2019

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 15 commits May 25, 2019 09:03
Based on the TODO, this case was added to short-circuit for ios builds,
which is no longer necessary.

The comment in this Makefile mentions rust-lang#29812 as a
dependency, but that issue has been since closed, with a statement that
the ICE of concern was resolved circa 1.12.

Here we remove this case, and just run the same branch for all targets.

Signed-off-by: Kristofer Rye <[email protected]>
Since this case statement no longer has any branches, remove it.

Signed-off-by: Kristofer Rye <[email protected]>
Didn't think it was this particular about things, but I also should
have tested locally.

It makes sense, though---`\` followed by LF would eat it, so we'd have
`sysroot done` instead of `sysroot; done` as it is parsed.  This should
pass now.

Signed-off-by: Kristofer Rye <[email protected]>
Tested-by: Kristofer Rye <[email protected]>
…r=wesleywiser

Allow to specify profiling data output directory as -Zself-profile argument.

The PR also makes `rustc` include the crate-name (if already available) in the output file name.

r? @wesleywiser

At some point we should add some basic tests for `-Zself-profile`.
split core::ptr module into multiple files

Cc @Centril
rename Scalar::Bits to Scalar::Raw and bits field to data

Also use this opportunity to seal some abstraction leaks (other modules constructing `Scalar::Bits` directly instead of using a constructor).

r? @oli-obk
… r=alexcrichton

Remove special case for *ios* builds in run-make-fulldeps/print-target-list Makefile

Previous `TODO` comment in this file mentions [an issue that was closed](rust-lang#29812), and I was able to confirm locally that provided code in that issue no longer produces an ICE. Discussion on that issue seems to indicate this code was no longer needed as of 1.12.0.

I removed the `*ios*` branch from this `case` statement as it may cause confusion, then removed the case statement entirely as it only had a wildcard branch.
@Centril
Copy link
Contributor Author

Centril commented May 28, 2019

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented May 28, 2019

📌 Commit e06547f 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 May 28, 2019
@bors
Copy link
Contributor

bors commented May 28, 2019

⌛ Testing commit e06547f with merge 7212685...

bors added a commit that referenced this pull request May 28, 2019
Rollup of 4 pull requests

Successful merges:

 - #61123 (Allow to specify profiling data output directory as -Zself-profile argument.)
 - #61159 (split core::ptr module into multiple files)
 - #61164 (rename Scalar::Bits to Scalar::Raw and bits field to data)
 - #61250 (Remove special case for *ios* builds in run-make-fulldeps/print-target-list Makefile)

Failed merges:

r? @ghost
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request May 28, 2019
@bors
Copy link
Contributor

bors commented May 28, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 28, 2019
@bors bors merged commit e06547f into rust-lang:master May 28, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #61274!

Tested on commit 7212685.
Direct link to PR: #61274

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 28, 2019
Tested on commit rust-lang/rust@7212685.
Direct link to PR: <rust-lang/rust#61274>

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 rls on windows: test-pass → build-fail (cc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-pass → build-fail (cc @Xanewok, @rust-lang/infra).
@Centril Centril deleted the rollup-23dekk4 branch May 28, 2019 20:32
bors added a commit to rust-lang/rust-clippy that referenced this pull request May 28, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request May 28, 2019
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 30, 2019
Changes:
````
Rustup to rust-lang#61203
rustup rust-lang#60928
rustup rust-lang#61164 (which is included in rust-lang#61274)
````
bors added a commit that referenced this pull request May 31, 2019
submodules: update clippy from fb33fad to d2f5122

Changes:
````
Rustup to #61203
rustup #60928
rustup #61164 (which is included in #61274)
````

Fixes #61287

r? @oli-obk
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
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.

6 participants