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

Trim rustc-workspace-hack #64384

Merged
merged 1 commit into from Sep 14, 2019

Conversation

@mati865
Copy link
Contributor

commented Sep 11, 2019

Those dependencies seem no longer necessary.
./x.py test and x86_64-gnu-tools container passed locally so I think this won't hurt.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Sep 11, 2019

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@mati865

This comment has been minimized.

Copy link
Contributor Author

commented Sep 11, 2019

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Sep 11, 2019

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

📌 Commit 6c2d99c has been approved by alexcrichton

Centril added a commit to Centril/rust that referenced this pull request Sep 11, 2019
Rollup merge of rust-lang#64384 - mati865:tools_hack, r=alexcrichton
Trim rustc-workspace-hack

Those dependencies seem no longer necessary.
`./x.py test` and `x86_64-gnu-tools` container passed locally so I think this won't hurt.
@ehuss

This comment has been minimized.

Copy link
Contributor

commented Sep 12, 2019

I suspect this won't work. At least for smallvec, cargo and clippy end up with different features. I don't think x86_64-gnu-tools is a good litmus, because I don't think it builds cargo.

bors added a commit that referenced this pull request Sep 12, 2019
Auto merge of #64390 - Centril:rollup-oexzlei, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #64359 (Forbid opaque types in `extern "C"` blocks)
 - #64360 (Correct the polymorphic extern fn error for const parameters)
 - #64372 (use randSecure and randABytes)
 - #64378 (Fix inconsistent link formatting.)
 - #64381 (Upgrade parking_lot and tempfile rustc dependencies)
 - #64384 (Trim rustc-workspace-hack)

Failed merges:

r? @ghost

@mati865 mati865 force-pushed the mati865:tools_hack branch from 6c2d99c to 612c394 Sep 12, 2019

@mati865

This comment has been minimized.

Copy link
Contributor Author

commented Sep 12, 2019

Reverted byteorder (can be removed when rust-lang/miri#948 lands) and smallvec, removed syn from build dependencies.

This time tested using dist container which reproduces the error from rollup.

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Sep 12, 2019

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 12, 2019

📌 Commit 612c394 has been approved by alexcrichton

Centril added a commit to Centril/rust that referenced this pull request Sep 13, 2019
Rollup merge of rust-lang#64384 - mati865:tools_hack, r=alexcrichton
Trim rustc-workspace-hack

Those dependencies seem no longer necessary.
`./x.py test` and `x86_64-gnu-tools` container passed locally so I think this won't hurt.
bors added a commit that referenced this pull request Sep 13, 2019
Auto merge of #64427 - Centril:rollup-afct85q, r=Centril
Rollup of 9 pull requests

Successful merges:

 - #64372 (use randSecure and randABytes)
 - #64375 (Fast path for vec.clear/truncate )
 - #64377 (Add long error explanation for E0493)
 - #64378 (Fix inconsistent link formatting.)
 - #64384 (Trim rustc-workspace-hack)
 - #64393 ( declare EnvKey before use to fix build error)
 - #64406 (Ban non-extern rust intrinsics)
 - #64423 (Add self to .mailmap)
 - #64425 (typo fix)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 13, 2019
Rollup merge of rust-lang#64384 - mati865:tools_hack, r=alexcrichton
Trim rustc-workspace-hack

Those dependencies seem no longer necessary.
`./x.py test` and `x86_64-gnu-tools` container passed locally so I think this won't hurt.
bors added a commit that referenced this pull request Sep 13, 2019
Auto merge of #64442 - Centril:rollup-0jxf91w, r=Centril
Rollup of 11 pull requests

Successful merges:

 - #64372 (use randSecure and randABytes)
 - #64375 (Fast path for vec.clear/truncate )
 - #64378 (Fix inconsistent link formatting.)
 - #64384 (Trim rustc-workspace-hack)
 - #64393 ( declare EnvKey before use to fix build error)
 - #64406 (Ban non-extern rust intrinsics)
 - #64422 (Remove raw string literal quotes from error index descriptions)
 - #64423 (Add self to .mailmap)
 - #64425 (typo fix)
 - #64431 (fn ptr is structural match)
 - #64435 (codegen: use "_N" (like for other locals) instead of "argN", for argument names.)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 14, 2019
Rollup merge of rust-lang#64384 - mati865:tools_hack, r=alexcrichton
Trim rustc-workspace-hack

Those dependencies seem no longer necessary.
`./x.py test` and `x86_64-gnu-tools` container passed locally so I think this won't hurt.
bors added a commit that referenced this pull request Sep 14, 2019
Auto merge of #64449 - Centril:rollup-ybq0h5v, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #64116 (Fix minor typo in docs.)
 - #64290 (Provide a span if main function is not present in crate)
 - #64302 (Shrink `ObligationCauseCode`)
 - #64372 (use randSecure and randABytes)
 - #64374 (Box `DiagnosticBuilder`.)
 - #64375 (Fast path for vec.clear/truncate )
 - #64378 (Fix inconsistent link formatting.)
 - #64384 (Trim rustc-workspace-hack)
 - #64393 ( declare EnvKey before use to fix build error)
 - #64420 (Inline `mark_neighbours_as_waiting_from`.)
 - #64422 (Remove raw string literal quotes from error index descriptions)
 - #64423 (Add self to .mailmap)
 - #64424 (Fix false "never constructed" warnings for `Self::` variant paths)
 - #64425 (typo fix)
 - #64431 (fn ptr is structural match)
 - #64435 (codegen: use "_N" (like for other locals) instead of "argN", for argument names.)
 - #64439 (fix #64430, confusing `owned_box` error message in no_std build)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 14, 2019
Rollup merge of rust-lang#64384 - mati865:tools_hack, r=alexcrichton
Trim rustc-workspace-hack

Those dependencies seem no longer necessary.
`./x.py test` and `x86_64-gnu-tools` container passed locally so I think this won't hurt.
bors added a commit that referenced this pull request Sep 14, 2019
Auto merge of #64452 - Centril:rollup-z101tu8, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #63846 (Added table containing the system calls used by Instant and SystemTime.)
 - #64116 (Fix minor typo in docs.)
 - #64290 (Provide a span if main function is not present in crate)
 - #64302 (Shrink `ObligationCauseCode`)
 - #64372 (use randSecure and randABytes)
 - #64374 (Box `DiagnosticBuilder`.)
 - #64375 (Fast path for vec.clear/truncate )
 - #64378 (Fix inconsistent link formatting.)
 - #64384 (Trim rustc-workspace-hack)
 - #64393 ( declare EnvKey before use to fix build error)
 - #64420 (Inline `mark_neighbours_as_waiting_from`.)
 - #64422 (Remove raw string literal quotes from error index descriptions)
 - #64423 (Add self to .mailmap)
 - #64425 (typo fix)
 - #64431 (fn ptr is structural match)
 - #64435 (codegen: use "_N" (like for other locals) instead of "argN", for argument names.)
 - #64439 (fix #64430, confusing `owned_box` error message in no_std build)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 14, 2019
Rollup merge of rust-lang#64384 - mati865:tools_hack, r=alexcrichton
Trim rustc-workspace-hack

Those dependencies seem no longer necessary.
`./x.py test` and `x86_64-gnu-tools` container passed locally so I think this won't hurt.
bors added a commit that referenced this pull request Sep 14, 2019
Auto merge of #64456 - Centril:rollup-ytqdwaq, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #63846 (Added table containing the system calls used by Instant and SystemTime.)
 - #64116 (Fix minor typo in docs.)
 - #64203 (A few cosmetic improvements to code & comments in liballoc and libcore)
 - #64302 (Shrink `ObligationCauseCode`)
 - #64372 (use randSecure and randABytes)
 - #64374 (Box `DiagnosticBuilder`.)
 - #64375 (Fast path for vec.clear/truncate )
 - #64378 (Fix inconsistent link formatting.)
 - #64384 (Trim rustc-workspace-hack)
 - #64393 ( declare EnvKey before use to fix build error)
 - #64420 (Inline `mark_neighbours_as_waiting_from`.)
 - #64422 (Remove raw string literal quotes from error index descriptions)
 - #64423 (Add self to .mailmap)
 - #64425 (typo fix)
 - #64431 (fn ptr is structural match)
 - #64435 (codegen: use "_N" (like for other locals) instead of "argN", for argument names.)
 - #64439 (fix #64430, confusing `owned_box` error message in no_std build)

Failed merges:

r? @ghost

@bors bors merged commit 612c394 into rust-lang:master Sep 14, 2019

4 checks passed

pr Build #20190912.17 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details

@mati865 mati865 deleted the mati865:tools_hack branch Sep 14, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.