Skip to content

Remove remaining calls to as_local_node_id #72750

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
May 30, 2020

Conversation

marmeladema
Copy link
Contributor

Split out from #72552

cc #50928

@rust-highfive
Copy link
Contributor

r? @eddyb

(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 May 29, 2020
@marmeladema
Copy link
Contributor Author

r? @petrochenkov

@rust-highfive rust-highfive assigned petrochenkov and unassigned eddyb May 29, 2020
@petrochenkov
Copy link
Contributor

Same comments from #72552 apply.

@petrochenkov petrochenkov 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 May 29, 2020
@marmeladema
Copy link
Contributor Author

marmeladema commented May 29, 2020

I've addressed the one comment I could, as I explained, I don't think I can use LocalDefid because it would mean changing ModuleData::normal_ancestor_id to LocalDefId and I don't that is possible.

Especially here: https://github.com/marmeladema/rust/blob/remove-as-local-node-id/src/librustc_resolve/build_reduced_graph.rs#L897-L903 the call to new_module can only accept a regular DefId, not a LocalDefId.

@marmeladema marmeladema force-pushed the remove-as-local-node-id branch from 55c776a to 2f3dd7b Compare May 29, 2020 19:06
@marmeladema
Copy link
Contributor Author

Ok, based on #72552 (comment) i've updated UsePlacementFinder to skip walking the crate entirely if the passed target_module is foreign.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented May 29, 2020

📌 Commit 2f3dd7b has been approved by petrochenkov

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 29, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request May 30, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#72033 (Update RELEASES.md for 1.44.0)
 - rust-lang#72162 (Add Extend::{extend_one,extend_reserve})
 - rust-lang#72419 (Miri read_discriminant: return a scalar instead of raw underlying bytes)
 - rust-lang#72621 (Don't bail out of trait selection when predicate references an error)
 - rust-lang#72677 (Fix diagnostics for `@ ..` binding pattern in tuples and tuple structs)
 - rust-lang#72710 (Add test to make sure -Wunused-crate-dependencies works with tests)
 - rust-lang#72724 (Revert recursive `TokenKind::Interpolated` expansion for now)
 - rust-lang#72741 (Remove unused mut from long-linker-command-lines test)
 - rust-lang#72750 (Remove remaining calls to `as_local_node_id`)
 - rust-lang#72752 (remove mk_bool)

Failed merges:

r? @ghost
@bors bors merged commit c20a97d into rust-lang:master May 30, 2020
@marmeladema marmeladema deleted the remove-as-local-node-id branch May 30, 2020 11:34
# for free to join this conversation on GitHub. Already have an account? # 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