Skip to content

Update compiler-builtins - #44509

Merged
bors merged 2 commits into
rust-lang:masterfrom
tamird:remove-rustbuild-feature
Sep 17, 2017
Merged

Update compiler-builtins#44509
bors merged 2 commits into
rust-lang:masterfrom
tamird:remove-rustbuild-feature

Conversation

@tamird

@tamirdtamird commented Sep 11, 2017

Copy link
Copy Markdown
Contributor

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

See commits.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 11, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 6a2e165 has been approved by nikomatsakis

@tamird
tamirdforce-pushed the remove-rustbuild-feature branch from 6a2e165 to 43a0761CompareSeptember 12, 2017 00:19
@tamirdtamird changed the title Remove unused rustbuild featureShims cleanupSep 12, 2017
@tamird
tamirdforce-pushed the remove-rustbuild-feature branch 2 times, most recently from 32d2e2f to 2b1fdbaCompareSeptember 12, 2017 01:19
@tamirdtamird changed the title Shims cleanupRemove unused rustbuild featureSep 12, 2017
@tamird

Copy link
Copy Markdown
ContributorAuthor

Pushed another commit - can I get another approval?

@nikomatsakis

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

@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

Copy link
Copy Markdown
ContributorAuthor

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
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.
@aidanhsaidanhs 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
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.
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
tamirdforce-pushed the remove-rustbuild-feature branch from 2b1fdba to 49492cbCompareSeptember 14, 2017 02:56
@tamirdtamird changed the title Remove unused rustbuild featureUpdate compiler-builtinsSep 14, 2017
@tamird

Copy link
Copy Markdown
ContributorAuthor

Ready for another look!

@nikomatsakis

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 14, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 49492cb has been approved by nikomatsakis

@bors

bors commented Sep 14, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 49492cb with merge aad2822d25f06d7246880290520ce54723e7620e...

@bors

bors commented Sep 14, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

Copy link
Copy Markdown
Member

@bors: retry

  • s3 outage

TimNN added a commit to TimNN/rust that referenced this pull request Sep 17, 2017
…nikomatsakis
Update compiler-builtins
~~I can't tell if this was ever used, but it's not used today.~~
See commits.
@TimNNTimNN mentioned this pull request Sep 17, 2017
TimNN added a commit to TimNN/rust that referenced this pull request Sep 17, 2017
…nikomatsakis
Update compiler-builtins
~~I can't tell if this was ever used, but it's not used today.~~
See commits.
@TimNNTimNN mentioned this pull request Sep 17, 2017
TimNN added a commit to TimNN/rust that referenced this pull request Sep 17, 2017
…nikomatsakis
Update compiler-builtins
~~I can't tell if this was ever used, but it's not used today.~~
See commits.
@TimNNTimNN mentioned this pull request Sep 17, 2017
bors added a commit that referenced this pull request Sep 17, 2017
@bors
bors merged commit 49492cb into rust-lang:masterSep 17, 2017
@tamird
tamird deleted the remove-rustbuild-feature branch September 17, 2017 16:43
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@tamird@rust-highfive@nikomatsakis@bors@alexcrichton@aidanhs