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

Cleanup: rename node_id_to_type(_opt) #58137

Merged
merged 2 commits into from Feb 13, 2019

Conversation

Projects
None yet
5 participants
@ljedrz
Copy link
Contributor

ljedrz commented Feb 4, 2019

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

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 4, 2019

r? @estebank

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

@eddyb

This comment has been minimized.

Copy link
Member

eddyb commented Feb 4, 2019

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

@estebank

This comment has been minimized.

Copy link
Contributor

estebank commented Feb 5, 2019

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

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 5, 2019

📌 Commit 13933aa has been approved by estebank

@ljedrz

This comment has been minimized.

Copy link
Contributor Author

ljedrz commented Feb 5, 2019

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

This comment has been minimized.

Copy link
Contributor

bors commented Feb 7, 2019

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

@ljedrz ljedrz force-pushed the ljedrz:cleanup_node_id_to_type branch from 13933aa to 892e4d0 Feb 7, 2019

@ljedrz

This comment has been minimized.

Copy link
Contributor Author

ljedrz commented Feb 7, 2019

Rebased.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 7, 2019

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)

@ljedrz ljedrz force-pushed the ljedrz:cleanup_node_id_to_type branch from 892e4d0 to 15b97be Feb 7, 2019

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 9, 2019

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

@ljedrz ljedrz force-pushed the ljedrz:cleanup_node_id_to_type branch from 15b97be to 1f848ec Feb 9, 2019

@ljedrz

This comment has been minimized.

Copy link
Contributor Author

ljedrz commented Feb 9, 2019

Rebased and renamed to node_type.

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 9, 2019

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

@ljedrz ljedrz force-pushed the ljedrz:cleanup_node_id_to_type branch from 1f848ec to eb669b3 Feb 9, 2019

@ljedrz ljedrz closed this Feb 9, 2019

@ljedrz ljedrz reopened this Feb 9, 2019

@ljedrz

This comment has been minimized.

Copy link
Contributor Author

ljedrz commented Feb 10, 2019

Rebased.

@estebank

This comment has been minimized.

Copy link
Contributor

estebank commented Feb 11, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 11, 2019

📌 Commit eb669b3 has been approved by estebank

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 11, 2019

⌛️ Testing commit eb669b3 with merge ad9fa8d...

bors added a commit that referenced this pull request Feb 11, 2019

Auto merge of #58137 - ljedrz:cleanup_node_id_to_type, r=estebank
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).
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 11, 2019

💔 Test failed - status-appveyor

@estebank

This comment has been minimized.

Copy link
Contributor

estebank commented Feb 12, 2019

@bors retry empty log on windows test

Centril added a commit to Centril/rust that referenced this pull request Feb 13, 2019

Rollup merge of rust-lang#58137 - ljedrz:cleanup_node_id_to_type, r=e…
…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).

Centril added a commit to Centril/rust that referenced this pull request Feb 13, 2019

Rollup merge of rust-lang#58137 - ljedrz:cleanup_node_id_to_type, r=e…
…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).

bors added a commit that referenced this pull request Feb 13, 2019

Auto merge of #58413 - Centril:rollup, r=Centril
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

Centril added a commit to Centril/rust that referenced this pull request Feb 13, 2019

Rollup merge of rust-lang#58137 - ljedrz:cleanup_node_id_to_type, r=e…
…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).

bors added a commit that referenced this pull request Feb 13, 2019

Auto merge of #58415 - Centril:rollup, r=Centril
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

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

1 check failed

homu Test failed
Details

@ljedrz ljedrz deleted the ljedrz:cleanup_node_id_to_type branch Feb 13, 2019

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

@flip1995 flip1995 referenced this pull request Feb 13, 2019

Merged

Rustup #3760

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment