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.

Sign up for GitHub

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

Jump to bottom

Update compiler-builtins #44509

Merged
merged 2 commits into from
Sep 17, 2017
Merged

Update compiler-builtins #44509

merged 2 commits into from
Sep 17, 2017

Conversation

tamird
Copy link
Contributor

@tamird tamird commented Sep 11, 2017 •
edited
Loading

I can't tell if this was ever used, but it's not used today.

See commits.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 11, 2017

📌 Commit 6a2e165 has been approved by nikomatsakis

@tamird tamird changed the title Remove unused rustbuild feature Shims cleanup Sep 12, 2017
@tamird tamird force-pushed the remove-rustbuild-feature branch 2 times, most recently from 32d2e2f to 2b1fdba Compare September 12, 2017 01:19
@tamird tamird changed the title Shims cleanup Remove unused rustbuild feature Sep 12, 2017
@tamird
Copy link
Contributor Author

tamird commented Sep 12, 2017

Pushed another commit - can I get another approval?

@nikomatsakis
Copy link
Contributor

@tamird do you see the travis failures? I can't tell if they are legit or not, but they definitely seem related to the builtins code.

Also, I'm confused about the change to double quotes -- is that an unrelated change?

@tamird
Copy link
Contributor Author

tamird commented Sep 12, 2017

@nikomatsakis yeah, I think the failures have to do with compiler-builtins being updated to pick up rust-lang/compiler-builtins#188, which picked up a bunch of other stuff. I'll dig in a little deeper today or tomorrow.

The second commit is unrelated, just a drive-by as the single quotes were confusing my IDE's TOML parser (and single quotes aren't used anywhere else).

@tamird tamird mentioned this pull request Sep 12, 2017
Merged
@tamird
Copy link
Contributor Author

tamird commented Sep 12, 2017

I was wrong! rustbuild is still used. I'll update this PR to just bump compiler-builtins after rust-lang/compiler-builtins#189 lands.

bors added a commit to rust-lang/compiler-builtins that referenced this pull request Sep 13, 2017
@bors
Auto merge of #189 - tamird:update-comment-rustbuild, r=alexcrichton
9addd11 
Update rustbuild commentary

r? @nikomatsakis

This is the reason that rust-lang/rust#44509 doesn't work - the `rustbuild` feature _is_ actually used, it was just incorrectly documented here and I missed it.
@aidanhs aidanhs added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 13, 2017
bors added a commit to rust-lang/compiler-builtins that referenced this pull request Sep 14, 2017
@bors
Auto merge of #189 - tamird:update-comment-rustbuild, r=alexcrichton
ef49515 
Update rustbuild commentary

r? @nikomatsakis

This is the reason that rust-lang/rust#44509 doesn't work - the `rustbuild` feature _is_ actually used, it was just incorrectly documented here and I missed it.
@tamird
Use double quotes to appease some TOML parsers
313b8f8
@tamird
Update compiler-builtins
49492cb 
Picks up the removal of the rustbuild feature, which is still used
in our local shim, along with a comment update explaining the usage.
@tamird tamird changed the title Remove unused rustbuild feature Update compiler-builtins Sep 14, 2017
@tamird
Copy link
Contributor Author

tamird commented Sep 14, 2017

Ready for another look!

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 14, 2017

📌 Commit 49492cb has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Sep 14, 2017

⌛ Testing commit 49492cb with merge aad2822d25f06d7246880290520ce54723e7620e...

@bors
Copy link
Contributor

bors commented Sep 14, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

@bors: retry

  • s3 outage

TimNN added a commit to TimNN/rust that referenced this pull request Sep 17, 2017
@TimNN
Rollup merge of rust-lang#44509 - tamird:remove-rustbuild-feature, r=…
334da4a 
…nikomatsakis

Update compiler-builtins

~~I can't tell if this was ever used, but it's not used today.~~

See commits.
@TimNN TimNN mentioned this pull request Sep 17, 2017
Closed
TimNN added a commit to TimNN/rust that referenced this pull request Sep 17, 2017
@TimNN
Rollup merge of rust-lang#44509 - tamird:remove-rustbuild-feature, r=…
6a3dbaa 
…nikomatsakis

Update compiler-builtins

~~I can't tell if this was ever used, but it's not used today.~~

See commits.
@TimNN TimNN mentioned this pull request Sep 17, 2017
Closed
TimNN added a commit to TimNN/rust that referenced this pull request Sep 17, 2017
@TimNN
Rollup merge of rust-lang#44509 - tamird:remove-rustbuild-feature, r=…
39710f8 
…nikomatsakis

Update compiler-builtins

~~I can't tell if this was ever used, but it's not used today.~~

See commits.
@TimNN TimNN mentioned this pull request Sep 17, 2017
Merged
bors added a commit that referenced this pull request Sep 17, 2017
@bors
Auto merge of #44654 - TimNN:rollup, r=TimNN
1cdd689 
Rollup of 17 pull requests

- Successful merges: #44073, #44088, #44381, #44397, #44509, #44533, #44549, #44553, #44562, #44567, #44595, #44604, #44617, #44622, #44630, #44639, #44647
- Failed merges:
@bors bors merged commit 49492cb into rust-lang:master Sep 17, 2017
@tamird tamird deleted the remove-rustbuild-feature branch September 17, 2017 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@tamird @rust-highfive @nikomatsakis @bors @alexcrichton @aidanhs