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

Keep environment variables in a BTreeMap to preserve sort order #7877

Merged
merged 1 commit into from
Feb 11, 2020

Conversation

joshtriplett
Copy link
Member

This prevents verbose output from varying between runs due to HashMap
(non-)ordering.

This prevents verbose output from varying between runs due to HashMap
(non-)ordering.
@rust-highfive
Copy link

r? @ehuss

(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 Feb 10, 2020
@alexcrichton
Copy link
Member

This seems fine by me, but isn't the output already nondeterministic due to parallelism? I'm curious why we'd want this part to be deterministic but not the whole thing?

@joshtriplett
Copy link
Member Author

The order of multiple rustc invocations isn't deterministic, but this makes the individual rustc command lines deterministic, which makes them easier to compare. I was trying to figure out what changed in the rustc command lines between two invocations, and this change made it much easier to do so.

@ehuss
Copy link
Contributor

ehuss commented Feb 11, 2020

Seems good to me.
@bors r+

@ehuss ehuss closed this Feb 11, 2020
@ehuss ehuss reopened this Feb 11, 2020
@ehuss
Copy link
Contributor

ehuss commented Feb 11, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 11, 2020

📌 Commit e84a4ed has been approved by ehuss

@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 Feb 11, 2020
@bors
Copy link
Collaborator

bors commented Feb 11, 2020

⌛ Testing commit e84a4ed with merge c31bd9d...

bors added a commit that referenced this pull request Feb 11, 2020
Keep environment variables in a BTreeMap to preserve sort order

This prevents verbose output from varying between runs due to HashMap
(non-)ordering.
@bors
Copy link
Collaborator

bors commented Feb 11, 2020

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing c31bd9d to master...

@bors bors merged commit e84a4ed into rust-lang:master Feb 11, 2020
bors added a commit to rust-lang/rust that referenced this pull request Feb 19, 2020
Update cargo

9 commits in 3c53211c3d7fee4f430f170115af5baad17a3da9..e02974078a692d7484f510eaec0e88d1b6cc0203
2020-02-07 15:35:03 +0000 to 2020-02-18 15:24:43 +0000
- Set an environment variable for tests to find executables. (rust-lang/cargo#7697)
- Rework internal errors. (rust-lang/cargo#7896)
- Improvements to StringList config handling. (rust-lang/cargo#7891)
- Add new/old rustflags to fingerprint log. (rust-lang/cargo#7890)
- Fix inaccurate doc comment on `env_args`. (rust-lang/cargo#7889)
- Add some extra fingerprint debug information. (rust-lang/cargo#7888)
- Link the licenses into crates/cargo-platform (rust-lang/cargo#7886)
- Modify test to make `rustc` PR mergeable (rust-lang/cargo#7883)
- Keep environment variables in a BTreeMap to preserve sort order (rust-lang/cargo#7877)
@ehuss ehuss added this to the 1.43.0 milestone Feb 6, 2022
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.

5 participants