Cleanup: rename node_id_to_type(_opt) #58137

ljedrz · 2019-02-04T08:46:48Z

Renames node_id_to_type(_opt) to hir_id_to_type(_opt); this makes it clear we are dealing with HIR nodes and their IDs here.

In addition, a drive-by commit removing ty::item_path::hir_path_str (as requested by @eddyb).

rust-highfive · 2019-02-04T08:46:51Z

r? @estebank

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

eddyb · 2019-02-04T13:26:10Z

I'd maybe call this node_type but this is also fine.
cc @michaelwoerister @nikomatsakis

estebank · 2019-02-05T09:16:43Z

Agree with @eddyb's preference, but won't hold up the PR :)

@bors r+

bors · 2019-02-05T09:16:44Z

📌 Commit 13933aa78658e811eb41c6316b2d5aa251f547fa has been approved by estebank

ljedrz · 2019-02-05T09:27:20Z

I'll be happy to rename it again during post-HirIdification cleanups; for now I'd just like to ensure I don't mix it up with actual NodeId methods.

bors · 2019-02-07T10:00:50Z

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

ljedrz · 2019-02-07T10:50:32Z

Rebased.

rust-highfive · 2019-02-07T11:23:49Z

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:04d9fc5d:start=1549538114881296812,finish=1549538117556446965,duration=2675150153
$ 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
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:08:16] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:08:16] expected success, got: exit code: 101
[00:08:16] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:08:16] Build completed unsuccessfully in 0:03:55
[00:08:16] make: *** [all] Error 1
[00:08:16] Makefile:18: recipe for target 'all' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:176b8d26
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Feb  7 11:23:44 UTC 2019
---
travis_time:end:267c1caa:start=1549538625798338138,finish=1549538625803878798,duration=5540660
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:33d06948
$ 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:3afd6dc0
travis_time:start:3afd6dc0
$ 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

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-02-09T04:05:48Z

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

ljedrz · 2019-02-09T08:54:23Z

Rebased and renamed to node_type.

bors · 2019-02-09T15:19:22Z

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

ljedrz · 2019-02-10T11:52:47Z

Rebased.

estebank · 2019-02-11T18:13:41Z

@bors r+

bors · 2019-02-11T18:13:43Z

📌 Commit eb669b3 has been approved by estebank

bors · 2019-02-11T22:52:39Z

⌛ Testing commit eb669b3 with merge ad9fa8d6f9434cb4750c9a6276c9825220b16a73...

bors · 2019-02-11T23:10:57Z

💔 Test failed - status-appveyor

estebank · 2019-02-12T01:01:33Z

@bors retry empty log on windows test

@eddyb

…stebank Cleanup: rename node_id_to_type(_opt) Renames `node_id_to_type(_opt)` to `hir_id_to_type(_opt)`; this makes it clear we are dealing with HIR nodes and their IDs here. In addition, a drive-by commit removing `ty::item_path::hir_path_str` (as requested by @eddyb).

@eddyb

…stebank Cleanup: rename node_id_to_type(_opt) Renames `node_id_to_type(_opt)` to `hir_id_to_type(_opt)`; this makes it clear we are dealing with HIR nodes and their IDs here. In addition, a drive-by commit removing `ty::item_path::hir_path_str` (as requested by @eddyb).

@ghost

Rollup of 13 pull requests Successful merges: - #57693 (Doc rewording) - #57815 (Speed up the fast path for assert_eq! and assert_ne!) - #58034 (Stabilize the time_checked_add feature) - #58057 (Stabilize linker-plugin based LTO (aka cross-language LTO)) - #58137 (Cleanup: rename node_id_to_type(_opt)) - #58166 (allow shorthand syntax for deprecation reason) - #58196 (Add specific feature gate error for const-unstable features) - #58200 (fix str mutating through a ptr derived from &self) - #58273 (Rename rustc_errors dependency in rust 2018 crates) - #58289 (impl iter() for dyn Error) - #58387 (Disallow `auto` trait alias syntax) - #58404 (use Ubuntu keyserver for CloudABI ports) - #58405 (Remove some dead code from libcore) Failed merges: r? @ghost

@eddyb

…stebank Cleanup: rename node_id_to_type(_opt) Renames `node_id_to_type(_opt)` to `hir_id_to_type(_opt)`; this makes it clear we are dealing with HIR nodes and their IDs here. In addition, a drive-by commit removing `ty::item_path::hir_path_str` (as requested by @eddyb).

@ghost

Rollup of 12 pull requests Successful merges: - #57693 (Doc rewording) - #57815 (Speed up the fast path for assert_eq! and assert_ne!) - #58034 (Stabilize the time_checked_add feature) - #58057 (Stabilize linker-plugin based LTO (aka cross-language LTO)) - #58137 (Cleanup: rename node_id_to_type(_opt)) - #58166 (allow shorthand syntax for deprecation reason) - #58200 (fix str mutating through a ptr derived from &self) - #58273 (Rename rustc_errors dependency in rust 2018 crates) - #58289 (impl iter() for dyn Error) - #58387 (Disallow `auto` trait alias syntax) - #58404 (use Ubuntu keyserver for CloudABI ports) - #58405 (Remove some dead code from libcore) Failed merges: r? @ghost

cc rust-lang/rust#58137

Rustup cc rust-lang/rust#58137

rust-highfive assigned estebank Feb 4, 2019

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

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 Feb 5, 2019

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 7, 2019

ljedrz force-pushed the cleanup_node_id_to_type branch from 13933aa to 892e4d0 Compare February 7, 2019 10:50

ljedrz force-pushed the cleanup_node_id_to_type branch from 892e4d0 to 15b97be Compare February 7, 2019 11:39

ljedrz force-pushed the cleanup_node_id_to_type branch from 15b97be to 1f848ec Compare February 9, 2019 08:54

ljedrz added 2 commits February 9, 2019 16:37

cleanup: rename node_id_to_type(_opt)

3a1a704

cleanup: remove hir_path_str

eb669b3

ljedrz force-pushed the cleanup_node_id_to_type branch from 1f848ec to eb669b3 Compare February 9, 2019 15:37

ljedrz closed this Feb 9, 2019

ljedrz reopened this Feb 9, 2019

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 Feb 11, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 11, 2019

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 Feb 12, 2019

Centril mentioned this pull request Feb 13, 2019

Rollup of 13 pull requests #58412

Closed

Centril mentioned this pull request Feb 13, 2019

Rollup of 13 pull requests #58413

Closed

Centril mentioned this pull request Feb 13, 2019

Rollup of 12 pull requests #58415

Merged

bors merged commit eb669b3 into rust-lang:master Feb 13, 2019

ljedrz deleted the cleanup_node_id_to_type branch February 13, 2019 09:05

flip1995 added a commit to rust-lang/rust-clippy that referenced this pull request Feb 13, 2019

Rustup

5a3cd31

cc rust-lang/rust#58137

flip1995 mentioned this pull request Feb 13, 2019

Rustup rust-lang/rust-clippy#3760

Merged

bors added a commit to rust-lang/rust-clippy that referenced this pull request Feb 13, 2019

Auto merge of #3760 - rust-lang:rustup, r=flip1995

d4755e1

Rustup cc rust-lang/rust#58137

Cleanup: rename node_id_to_type(_opt) #58137

Cleanup: rename node_id_to_type(_opt) #58137

Uh oh!

Conversation

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

Uh oh!

Uh oh!

rust-highfive commented Feb 4, 2019

Uh oh!

eddyb commented Feb 4, 2019

Uh oh!

estebank commented Feb 5, 2019

Uh oh!

bors commented Feb 5, 2019

Uh oh!

ljedrz commented Feb 5, 2019

Uh oh!

bors commented Feb 7, 2019

Uh oh!

ljedrz commented Feb 7, 2019

Uh oh!

rust-highfive commented Feb 7, 2019

Uh oh!

bors commented Feb 9, 2019

Uh oh!

ljedrz commented Feb 9, 2019

Uh oh!

bors commented Feb 9, 2019

Uh oh!

ljedrz commented Feb 10, 2019

Uh oh!

estebank commented Feb 11, 2019

Uh oh!

bors commented Feb 11, 2019

Uh oh!

bors commented Feb 11, 2019

Uh oh!

bors commented Feb 11, 2019

Uh oh!

estebank commented Feb 12, 2019

Uh oh!

Uh oh!

ljedrz commented Feb 4, 2019 •

edited

Loading