Replace some uses of NodeId with HirId by ljedrz · Pull Request #61836 · rust-lang/rust

ljedrz · 2019-06-14T14:17:44Z

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 · 2019-06-14T14:17:47Z

r? @varkor

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

bors · 2019-06-14T19:12:53Z

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

rust-highfive · 2019-06-16T15:56:23Z

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 · 2019-06-17T16:37:47Z

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

ljedrz · 2019-06-17T17:05:56Z

It seems that @varkor is busy.

r? @Zoxc

Zoxc · 2019-06-17T17:58:25Z

r=me with the extra space removed

@bors delegate+

bors · 2019-06-17T17:58:27Z

✌️ @ljedrz can now approve this pull request

Zoxc · 2019-06-17T18:19:52Z

@bors p=1

ljedrz · 2019-06-17T18:53:48Z

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

@bors r=Zoxc

bors · 2019-06-17T18:53:49Z

📌 Commit e1bf56d has been approved by ljedrz

Replace some uses of NodeId with HirId 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.

ljedrz · 2019-06-17T18:56:50Z

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

bors · 2019-06-17T18:59:17Z

💡 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 · 2019-06-17T18:59:18Z

📌 Commit e1bf56d has been approved by Zoxc

ljedrz · 2019-06-17T18:59:43Z

I guess I can 🙂 .

Centril · 2019-06-17T19:24:28Z

I guess I can 🙂 .

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

@ghost

Rollup of 5 pull requests Successful merges: - #61702 (test more variants of enum-int-casting) - #61836 (Replace some uses of NodeId with HirId) - #61885 (Help LLVM better optimize slice::Iter(Mut)::len) - #61893 (make `Weak::ptr_eq`s into methods) - #61908 (don't ICE on large files) Failed merges: r? @ghost

rustup rust-lang/rust#61836 changelog: none

Changes: ```` rustup rust-lang#61836 fix suggestion for floating points inequality ````

@oli-obk

submodules: update clippy from be5d17f to 868f168 Changes: ```` rustup #61836 fix suggestion for floating points inequality ```` r? @oli-obk

Changes: ```` rustup rust-lang/rust#61836 fix suggestion for floating points inequality ````

rust-highfive assigned varkor Jun 14, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 14, 2019

Mark-Simulacrum reviewed Jun 14, 2019
View reviewed changes

Comment threadsrc/librustc/hir/map/hir_id_validator.rs Outdated

Centril reviewed Jun 14, 2019
View reviewed changes

Comment threadsrc/librustc/hir/map/mod.rs Outdated

Centril reviewed Jun 14, 2019
View reviewed changes

Comment threadsrc/librustc/hir/map/mod.rs Outdated

ljedrz force-pushed the i_still_hate_node_ids branch from e805bea to 95322abCompare June 14, 2019 17:15

ljedrz force-pushed the i_still_hate_node_ids branch from 95322ab to 9c280d6Compare June 14, 2019 20:02

eddyb reviewed Jun 16, 2019
View reviewed changes

Comment threadsrc/librustc/cfg/graphviz.rs Outdated

eddyb reviewed Jun 16, 2019
View reviewed changes

Comment threadsrc/librustc/hir/map/mod.rs Outdated

eddyb reviewed Jun 16, 2019
View reviewed changes

Comment threadsrc/librustc/cfg/construct.rs Outdated

ljedrz force-pushed the i_still_hate_node_ids branch from 46759d2 to d22807fCompare June 16, 2019 16:09

ljedrz added 6 commits June 17, 2019 18:57

replace some uses of NodeId with HirId
61964d9

remove _by_hir_id if there is no NodeId counterpart
d996c4d

renamve hir_to_string to node_to_string
1c8551b

fix a HIR doc, simplify one HIR-related function call
21fbb59

simplify ICE handling in HirIdValidator
88961b0

change NodeId to HirId in some HIR docs
72bb5c7

ljedrz force-pushed the i_still_hate_node_ids branch from d22807f to 61e004dCompare June 17, 2019 17:05

fix rebase fallout
61e004d

rust-highfive assigned Zoxc and unassigned varkor Jun 17, 2019

Zoxc reviewed Jun 17, 2019
View reviewed changes

Comment threadsrc/librustc_borrowck/borrowck/mod.rs Outdated

remove superfluous space
e1bf56d

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 Jun 17, 2019

Centril mentioned this pull request Jun 17, 2019
Rollup of 5 pull requests #61915
Merged

bors merged commit e1bf56d into rust-lang:masterJun 18, 2019

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Jun 18, 2019
rustuprust-lang/rust#61836
4d984dc

bors added a commit to rust-lang/rust-clippy that referenced this pull request Jun 18, 2019
Auto merge of#4215- matthiaskrgr:rustup_9, r=flip1995
868f168
rustup rust-lang/rust#61836 changelog: none

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 18, 2019
submodules: update clippy frombe5d17fto868f168
6a084dc
Changes: ```` rustup rust-lang#61836 fix suggestion for floating points inequality ````

ljedrz deleted the i_still_hate_node_ids branch June 18, 2019 15:21

bors added a commit that referenced this pull request Jun 18, 2019
Auto merge of#61932- matthiaskrgr:submodule_upd, r=oli-obk
673cf7d
submodules: update clippy from be5d17f to 868f168 Changes: ```` rustup #61836 fix suggestion for floating points inequality ```` r? @oli-obk

flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
submodules: update clippy frombe5d17fto868f168
3ba9ac9
Changes: ```` rustup rust-lang/rust#61836 fix suggestion for floating points inequality ````

Uh oh!

Uh oh!

Conversation

ljedrz commented Jun 14, 2019

Uh oh!

rust-highfive commented Jun 14, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented Jun 14, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rust-highfive commented Jun 16, 2019

Uh oh!

bors commented Jun 17, 2019

Uh oh!

ljedrz commented Jun 17, 2019

Uh oh!

Uh oh!

Zoxc commented Jun 17, 2019

Uh oh!

bors commented Jun 17, 2019

Uh oh!

Zoxc commented Jun 17, 2019

Uh oh!

ljedrz commented Jun 17, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Jun 17, 2019

Uh oh!

ljedrz commented Jun 17, 2019

Uh oh!

bors commented Jun 17, 2019

Uh oh!

bors commented Jun 17, 2019

Uh oh!

ljedrz commented Jun 17, 2019

Uh oh!

Centril commented Jun 17, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

ljedrz commented Jun 17, 2019•
edited
Loading