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

Ensure [target] rustflags are deterministically passed #4950

Merged
merged 1 commit into from
Jan 17, 2018

Conversation

alexcrichton
Copy link
Member

The usage of HashMap in the Config tables introduced some nondeterminism, so
reverse that with a sort right before we pass it down to rustc. One day we'll
probably want to sort by the position where these keys were defined, but for now
a blanket sort should do the trick.

Closes #4935

The usage of `HashMap` in the `Config` tables introduced some nondeterminism, so
reverse that with a sort right before we pass it down to rustc. One day we'll
probably want to sort by the position where these keys were defined, but for now
a blanket sort should do the trick.

Closes rust-lang#4935
@rust-highfive
Copy link

r? @matklad

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

@matklad
Copy link
Member

matklad commented Jan 16, 2018

@bors r+

👍

@bors
Copy link
Contributor

bors commented Jan 16, 2018

📌 Commit c9803a4 has been approved by matklad

@bors
Copy link
Contributor

bors commented Jan 16, 2018

⌛ Testing commit c9803a4 with merge 403fbcd...

bors added a commit that referenced this pull request Jan 16, 2018
Ensure `[target]` rustflags are deterministically passed

The usage of `HashMap` in the `Config` tables introduced some nondeterminism, so
reverse that with a sort right before we pass it down to rustc. One day we'll
probably want to sort by the position where these keys were defined, but for now
a blanket sort should do the trick.

Closes #4935
@bors
Copy link
Contributor

bors commented Jan 17, 2018

💔 Test failed - status-travis

@alexcrichton
Copy link
Member Author

alexcrichton commented Jan 17, 2018 via email

@bors
Copy link
Contributor

bors commented Jan 17, 2018

⌛ Testing commit c9803a4 with merge 1fbb5ca633dc71faa958860934ccafdd683b4c0a...

@bors
Copy link
Contributor

bors commented Jan 17, 2018

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member Author

alexcrichton commented Jan 17, 2018 via email

bors added a commit that referenced this pull request Jan 17, 2018
Ensure `[target]` rustflags are deterministically passed

The usage of `HashMap` in the `Config` tables introduced some nondeterminism, so
reverse that with a sort right before we pass it down to rustc. One day we'll
probably want to sort by the position where these keys were defined, but for now
a blanket sort should do the trick.

Closes #4935
@bors
Copy link
Contributor

bors commented Jan 17, 2018

⌛ Testing commit c9803a4 with merge 7d75776...

@bors
Copy link
Contributor

bors commented Jan 17, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: matklad
Pushing 7d75776 to master...

@bors bors merged commit c9803a4 into rust-lang:master Jan 17, 2018
@alexcrichton alexcrichton deleted the rustflags-orderd branch January 25, 2018 16:30
@ehuss ehuss added this to the 1.25.0 milestone Feb 6, 2022
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.

Cargo config: Rustflags are concatenated in non-deterministic order
5 participants