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

Eagerly intern and check CrateNum/StableCrateId collisions #109213

Merged
merged 1 commit into from
Mar 23, 2023
Merged

Eagerly intern and check CrateNum/StableCrateId collisions #109213

merged 1 commit into from
Mar 23, 2023

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Mar 16, 2023

r? @cjgillot

It seems better to check things ahead of time than checking them afterwards.
The previous version was a bit nonsensical, so this addresses the feedback

@rustbot
Copy link
Collaborator

rustbot commented Mar 16, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @cjgillot (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 16, 2023
@rustbot
Copy link
Collaborator

rustbot commented Mar 16, 2023

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Mar 16, 2023

These commits modify the Cargo.lock file. Random changes to Cargo.lock can be introduced when switching branches and rebasing PRs.
This was probably unintentional and should be reverted before this PR is merged.

If this was intentional then you can ignore this comment.

cjgillot
cjgillot reviewed Mar 18, 2023
View reviewed changes
Copy link
Contributor

@cjgillot cjgillot left a comment

Choose a reason for hiding this comment

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

This PR makes a lot of sense, thank you.

compiler/rustc_span/src/def_id/stable_crate_id_map.rs Outdated Show resolved Hide resolved
@cjgillot cjgillot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2023
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 21, 2023

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 21, 2023
cjgillot
cjgillot approved these changes Mar 21, 2023
View reviewed changes
Copy link
Contributor

@cjgillot cjgillot left a comment

Choose a reason for hiding this comment

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

Does this need a perf run?
If not, r=me with one nit.

compiler/rustc_span/src/def_id/stable_crate_id_map.rs Outdated Show resolved Hide resolved
@oli-obk oli-obk force-pushed the cstore branch 2 times, most recently from b9596a5 to 6ce267c Compare March 21, 2023 12:07
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 21, 2023

Does this need a perf run?

No, there's nothing that could really affect perf here. It's not hot anyway.

@bors r=cjgillot

@bors
Copy link
Contributor

bors commented Mar 21, 2023

📌 Commit 460ecd2 has been approved by cjgillot

It is now in the queue for this repository.

@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 Mar 21, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 21, 2023
@Dylan-DPC
Rollup merge of rust-lang#109213 - oli-obk:cstore, r=cjgillot
b2e0fe0 
Eagerly intern and check CrateNum/StableCrateId collisions

r? `@cjgillot`

It seems better to check things ahead of time than checking them afterwards.
The [previous version](rust-lang#108390) was a bit nonsensical, so this addresses the feedback
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 21, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 22, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 23, 2023
@bors
Auto merge of rust-lang#109503 - matthiaskrgr:rollup-cnp7kdd, r=matth…
84dd6df 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#108954 (rustdoc: handle generics better when matching notable traits)
 - rust-lang#109203 (refactor/feat: refactor identifier parsing a bit)
 - rust-lang#109213 (Eagerly intern and check CrateNum/StableCrateId collisions)
 - rust-lang#109358 (rustc: Remove unused `Session` argument from some attribute functions)
 - rust-lang#109359 (Update stdarch)
 - rust-lang#109378 (Remove Ty::is_region_ptr)
 - rust-lang#109423 (Use region-erased self type during IAT selection)
 - rust-lang#109447 (new solver cleanup + implement coherence)
 - rust-lang#109501 (make link clickable)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 950aa3e into rust-lang:master Mar 23, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 23, 2023
@oli-obk oli-obk deleted the cstore branch March 23, 2023 09:35
This was referenced May 8, 2023
Open
Closed
@oli-obk oli-obk mentioned this pull request May 11, 2023
Merged
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request May 23, 2023
@Dylan-DPC
Rollup merge of rust-lang#111461 - oli-obk:crate_collision, r=petroch…
731c1a5 
…enkov

Fix symbol conflict diagnostic mistakenly being shown instead of missing crate diagnostic

This was a refactoring mistake in rust-lang#109213

fixes rust-lang#111284
@ehuss ehuss mentioned this pull request Dec 9, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjgillot cjgillot cjgillot approved these changes

Assignees

@cjgillot cjgillot

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
5 participants
@oli-obk @rustbot @rust-log-analyzer @bors @cjgillot