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

Remove NodeId from hir::Block #58651

Closed
wants to merge 3 commits into from
Closed

Conversation

ljedrz
Copy link
Contributor

@ljedrz ljedrz commented Feb 22, 2019

The next iteration of #57578. The relevant part is the last commit (the others are dependencies).

Blocked by #58561.

r? @Zoxc

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 22, 2019
@ljedrz
Copy link
Contributor Author

ljedrz commented Feb 22, 2019

@Zoxc I can append this change to #58561 if that's ok (the PR queue has been super slow lately).

@@ -679,7 +678,7 @@ pub fn check_unsafety<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) {
}

let mut unsafe_blocks: Vec<_> = unsafe_blocks.into_iter().collect();
unsafe_blocks.sort();
unsafe_blocks.sort_by_cached_key(|(hir_id, _)| tcx.hir().hir_to_node_id(*hir_id));
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'm not sure if this is the best way to tackle it, but the regular sort now breaks the order of error messages in 2 "unnecessary unsafe" test cases.

@ljedrz
Copy link
Contributor Author

ljedrz commented Feb 24, 2019

Closing in favor of #58698.

@ljedrz ljedrz closed this Feb 24, 2019
@ljedrz ljedrz deleted the HirIdify_block branch February 26, 2019 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants