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.

Sign up for GitHub

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

Jump to bottom

Handle path prefix mapping in a more stable way when computing the crate hash #48162

Merged
merged 1 commit into from
Feb 15, 2018
Merged

Handle path prefix mapping in a more stable way when computing the crate hash #48162

merged 1 commit into from
Feb 15, 2018

Conversation

michaelwoerister
Copy link
Member

This hopefully fixes issue #48019.

cc @luser @infinity0

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@michaelwoerister michaelwoerister mentioned this pull request Feb 12, 2018
Closed
@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 12, 2018
nikomatsakis
nikomatsakis requested changes Feb 12, 2018
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

r=me w/ clarifications

src/librustc/hir/map/collector.rs Outdated
@@ -147,11 +149,25 @@ impl<'a, 'hir> NodeCollector<'a, 'hir> {
(name1, dis1).cmp(&(name2, dis2))
});

// We hash the names of all local source files so we don't have to
Copy link
Contributor

Choose a reason for hiding this comment

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

Actually, I find this comment a bit unclear. What exactly are we hashing here? Are these the "post-remapping" names being hashed?

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct, yes. I'll update the comment.

@michaelwoerister
Copy link
Member Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Feb 13, 2018

📌 Commit 0397fc1 has been approved by nikomatsakis

@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 13, 2018
@michaelwoerister
Copy link
Member Author

@bors rollup

@kennytm kennytm mentioned this pull request Feb 14, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Feb 14, 2018
@kennytm
Rollup merge of rust-lang#48162 - michaelwoerister:stabler-svh, r=nik…
d38e11e 
…omatsakis

Handle path prefix mapping in a more stable way when computing the crate hash

This hopefully fixes issue rust-lang#48019.

cc @luser @infinity0
bors added a commit that referenced this pull request Feb 14, 2018
@bors
Auto merge of #48203 - kennytm:rollup, r=kennytm
d3fb063 
Rollup of 22 pull requests

- Successful merges: #47784, #47806, #47846, #48005, #48033, #48065, #48087, #48114, #48126, #48130, #48133, #48151, #48154, #48156, #48162, #48163, #48165, #48167, #48181, #48186, #48195, #48035
- Failed merges:
bors added a commit that referenced this pull request Feb 15, 2018
@bors
Auto merge of #48203 - kennytm:rollup, r=kennytm
f6ee1ec 
Rollup of 22 pull requests

- Successful merges: #47784, #47806, #47846, #48005, #48033, #48065, #48087, #48114, #48126, #48130, #48133, #48151, #48154, #48156, #48162, #48163, #48165, #48167, #48181, #48186, #48195, #48035
- Failed merges:
bors added a commit that referenced this pull request Feb 15, 2018
@bors
Auto merge of #48203 - kennytm:rollup, r=kennytm
1670a53 
Rollup of 23 pull requests

- Successful merges: #47784, #47806, #47846, #48005, #48033, #48065, #48087, #48114, #48126, #48130, #48133, #48151, #48154, #48156, #48162, #48163, #48165, #48167, #48181, #48186, #48195, #48035, #48210
- Failed merges:
@kennytm kennytm merged commit 0397fc1 into rust-lang:master Feb 15, 2018
@luser luser mentioned this pull request Feb 20, 2018
Closed
@jsgf jsgf mentioned this pull request Feb 22, 2018
Merged
@jyn514 jyn514 mentioned this pull request Apr 16, 2021
Merged
@michaelwoerister michaelwoerister mentioned this pull request Apr 22, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@michaelwoerister @rust-highfive @bors @nikomatsakis @kennytm