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
Merged

Trim rustc-workspace-hack #64384

merged 1 commit into from
Sep 14, 2019

Conversation

mati865
Copy link
Contributor

@mati865 mati865 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
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 11, 2019
@mati865
Copy link
Contributor Author

mati865 commented Sep 11, 2019

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 11, 2019

📌 Commit 6c2d99c has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 11, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 11, 2019
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
Copy link
Contributor

ehuss 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.

@mati865
Copy link
Contributor Author

mati865 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
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors 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
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.
Centril added a commit to Centril/rust that referenced this pull request Sep 13, 2019
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.
Centril added a commit to Centril/rust that referenced this pull request Sep 14, 2019
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.
Centril added a commit to Centril/rust that referenced this pull request Sep 14, 2019
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.
Centril added a commit to Centril/rust that referenced this pull request Sep 14, 2019
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
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
@mati865 mati865 deleted the tools_hack branch September 14, 2019 19:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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