Remove NodeId from Block and Expr

[ljedrz]

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

Removes NodeId from

• hir::Block
• hir::Expr

Blocked by #58561, can be appended to it.

r? @Zoxc

[ljedrz]

Oof, I forgot about the Expr size assertion; I'll update shortly.

[Zoxc]

I think it's find to just use sort here. Do you know which errors changed order with that?

[ljedrz]

Nope, plain sort breaks 2 issue test cases related to unused unsafe (unfortunately I forgot to register which ones).

[Zoxc]

Well we can land sort_by_cached_key here and you could open a new PR with an additional commit which changes it back to sort, so we can look at the failures.

[Zoxc]

You added expr here. Not sure if that's good or bad =P

[ljedrz]

Yes, so that it matches the other branches; I mean, it shouldn't break anything ^^.

[Zoxc]

This formatting doesn't quite make sense to me =P

[ljedrz]

I think I was just trying to squeeze it so that tidy doesn't complain; I can adjust it if need be :P.

[Zoxc]

I've looked over this and it looks good. You can append it to #58561

[ljedrz]

@Zoxc done; what about that static_assert on Expr, though? I forgot to alter it, but it doesn't seem to break anything.

[ljedrz]

Oh, and closing in favor of #58561.

[Zoxc]

@ljedrz That's probably due to padding.

[ljedrz]

@Zoxc I ran tests with that plain sort locally; the results are as follows:

failures:
---- [ui] ui\issues\issue-45107-unnecessary-unsafe-in-closure.rs stdout ----
diff of stderr:
1 error: unnecessary `unsafe` block
- --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:7:13
+ --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:9:38
3 |
4 LL | unsafe {
5 | ------ because it's nested under this `unsafe` block
- LL | let f = |v: &mut Vec<_>| {
- LL | unsafe { //~ ERROR unnecessary `unsafe`
- | ^^^^^^ unnecessary `unsafe` block
+ ...
+ LL | |w: &mut Vec<u32>| { unsafe { //~ ERROR unnecessary `unsafe`
+ | ^^^^^^ unnecessary `unsafe` block
9 |
10 note: lint level defined here
11 --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:1:8
14 | ^^^^^^^^^^^^^
15
16 error: unnecessary `unsafe` block
- --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:9:38
+ --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:7:13
18 |
19 LL | unsafe {
20 | ------ because it's nested under this `unsafe` block
- ...
- LL | |w: &mut Vec<u32>| { unsafe { //~ ERROR unnecessary `unsafe`
- | ^^^^^^ unnecessary `unsafe` block
+ LL | let f = |v: &mut Vec<_>| {
+ LL | unsafe { //~ ERROR unnecessary `unsafe`
+ | ^^^^^^ unnecessary `unsafe` block
24
25 error: unnecessary `unsafe` block
26 --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:13:34
---- [ui] ui\span\lint-unused-unsafe.rs stdout ----
diff of stderr:
47 | ^^^^^^ unnecessary `unsafe` block
48
49 error: unnecessary `unsafe` block
- --> $DIR/lint-unused-unsafe.rs:29:5
+ --> $DIR/lint-unused-unsafe.rs:30:9
51 |
52 LL | unsafe fn bad7() {
53 | ---------------- because it's nested under this `unsafe` fn
54 LL | unsafe { //~ ERROR: unnecessary `unsafe` block
- | ^^^^^^ unnecessary `unsafe` block
+ LL | unsafe { //~ ERROR: unnecessary `unsafe` block
+ | ^^^^^^ unnecessary `unsafe` block
56
57 error: unnecessary `unsafe` block
- --> $DIR/lint-unused-unsafe.rs:30:9
+ --> $DIR/lint-unused-unsafe.rs:29:5
59 |
60 LL | unsafe fn bad7() {
61 | ---------------- because it's nested under this `unsafe` fn
62 LL | unsafe { //~ ERROR: unnecessary `unsafe` block
- LL | unsafe { //~ ERROR: unnecessary `unsafe` block
- | ^^^^^^ unnecessary `unsafe` block
+ | ^^^^^^ unnecessary `unsafe` block
65
66 error: aborting due to 8 previous errors
67
failures:
[ui] ui\issues\issue-45107-unnecessary-unsafe-in-closure.rs
[ui] ui\span\lint-unused-unsafe.rs