Skip to content

allow enabling features for deps with --features#2876

Merged
bors merged 1 commit into
rust-lang:masterfrom
bennofs:fix-2851
Jul 14, 2016
Merged

allow enabling features for deps with --features#2876
bors merged 1 commit into
rust-lang:masterfrom
bennofs:fix-2851

Conversation

@bennofs

@bennofs bennofs commented Jul 14, 2016

Copy link
Copy Markdown
Contributor

Fixes #2851

@rust-highfive

Copy link
Copy Markdown

r? @alexcrichton

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

Comment thread tests/features.rs Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you update these to with_status(101) and an assertion about what stderr should be as well?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I also update the first one (the build failure one)? Because asserting what stderr should be for that one will depend on rustc compiler output, which makes the test a little bit fragile, no?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add with_status(101) but yeah we should avoid asserting much about the compiler's exact output

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, force-pushed a new commit that fixes this.

@alexcrichton

Copy link
Copy Markdown
Member

Thanks @bennofs!

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ 6f28ef2

Thanks!

@bors

bors commented Jul 14, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit 6f28ef2 with merge 696e615...

bors added a commit that referenced this pull request Jul 14, 2016
allow enabling features for deps with --features

Fixes #2851
@bors

bors commented Jul 14, 2016

Copy link
Copy Markdown
Contributor

☀️ Test successful - cargo-cross-linux, cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64
Approved by: alexcrichton
Pushing 696e615 to master...

@bors bors merged commit 6f28ef2 into rust-lang:master Jul 14, 2016
@bennofs bennofs deleted the fix-2851 branch July 14, 2016 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants