Replace some uses of NodeId with HirId

[ljedrz]

We are still using NodeId in some spots where we could use HirId instead; this PR targets some of these spots and removes some of the associated hir::map functions.

[rust-highfive]

r? @varkor

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

[bors]

☔ The latest upstream changes (presumably #61817) made this pull request unmergeable. Please resolve the merge conflicts.

[rust-highfive]

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:273ea4f0:start=1560699976089396979,finish=1560700063544742234,duration=87455345255
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:06:40]    Compiling syntax_pos v0.0.0 (/checkout/src/libsyntax_pos)
[00:06:44]    Compiling rustc_errors v0.0.0 (/checkout/src/librustc_errors)
[00:06:44]    Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
[00:07:54]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:08:16] error[E0599]: no method named `attrs_by_hir_id` found for type `&hir::map::Map<'_>` in the current scope
[00:08:16]     --> src/librustc/middle/resolve_lifetime.rs:1593:55
[00:08:16]      |
[00:08:16] 1593 |                                     if self.tcx.hir().attrs_by_hir_id(parent_hir_id).iter()
[00:08:16]      |                                                       ^^^^^^^^^^^^^^^ help: there is a method with a similar name: `get_by_hir_id`
[00:08:26] error: aborting due to previous error
[00:08:26] 
[00:08:26] For more information about this error, try `rustc --explain E0599`.
[00:08:26] error: Could not compile `rustc`.
---
travis_time:end:14092866:start=1560700579630167601,finish=1560700579634682389,duration=4514788
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:203a18b0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:3735c81f
travis_time:start:3735c81f
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:032dac38
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

[bors]

☔ The latest upstream changes (presumably #61857) made this pull request unmergeable. Please resolve the merge conflicts.

[ljedrz]

It seems that @varkor is busy.

r? @Zoxc

[Zoxc]

r=me with the extra space removed

@bors delegate+

[bors]

✌️ @ljedrz can now approve this pull request

[Zoxc]

@bors p=1

[ljedrz]

The pre-space build is green, I don't think it will change ^^.

@bors r=Zoxc

[bors]

📌 Commit e1bf56d has been approved by ljedrz

[ljedrz]

@Zoxc whoops, I forgot to do r=; can still I adjust it after r+ing?

[bors]

💡 This pull request was already approved, no need to approve it again.

• There's another pull request that is currently being tested, blocking this pull request: prepare for Intptrcast model #61781

[bors]

📌 Commit e1bf56d has been approved by Zoxc

[ljedrz]

I guess I can 🙂 .

[Centril]

I guess I can 🙂 .

But it doesn't matter once the PR is in a rollup because merge commit has already been made ^^