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

Include the linker in the fingerprint. #9647

Merged
merged 1 commit into from
Jul 2, 2021

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jul 2, 2021

This adds the linker from the [target] config table to the fingerprint. Previously, changing the value would not trigger a rebuild.

@rust-highfive
Copy link

r? @alexcrichton

(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 Jul 2, 2021
@ehuss
Copy link
Contributor Author

ehuss commented Jul 2, 2021

I could swear we've talked about this, but I can't find any records or issues related to it.

@@ -812,7 +812,7 @@ impl Fingerprint {
*self.memoized_hash.lock().unwrap() = None;
}

fn hash(&self) -> u64 {
fn hash_u64(&self) -> u64 {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I renamed this because there were two functions with the same name but different signatures (the inherent fn and the trait). This caused a problem when importing the trait, and was also confusing.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Jul 2, 2021

📌 Commit 28c3bef has been approved by alexcrichton

@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 Jul 2, 2021
@bors
Copy link
Collaborator

bors commented Jul 2, 2021

⌛ Testing commit 28c3bef with merge 0a38a21...

@bors
Copy link
Collaborator

bors commented Jul 2, 2021

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing 0a38a21 to master...

@bors bors merged commit 0a38a21 into rust-lang:master Jul 2, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 3, 2021
Update cargo

5 commits in 4952979031e2cf1d901c817a32e25a156a19db4c..3ebb5f15a940810f250b68821149387af583a79e
2021-07-01 01:14:50 +0000 to 2021-07-02 20:35:38 +0000
- Adjust the edition2021 resolver diff report. (rust-lang/cargo#9649)
- Include the linker in the fingerprint. (rust-lang/cargo#9647)
- Temporarily disable windows env test. (rust-lang/cargo#9646)
- Handle git deleted files with dirty worktree. (rust-lang/cargo#9645)
- Adjust error message with offline and frozen. (rust-lang/cargo#9644)
@ehuss ehuss added this to the 1.55.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.

None yet

4 participants