Skip to content
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

Remove NodeId from some HIR nodes #58561

Merged
merged 13 commits into from
Feb 26, 2019
Merged

Conversation

ljedrz
Copy link
Contributor

@ljedrz ljedrz commented Feb 18, 2019

The next iteration of #57578.

Removes NodeId from:

  • Lifetime
  • Ty
  • GenericParam
  • WhereClause
  • WhereEqPredicate
  • MacroDef
  • Block
  • Expr

r? @Zoxc

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 18, 2019
@rust-highfive
Copy link
Collaborator

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:0fd4b7b5:start=1550505041681172177,finish=1550505043963344548,duration=2282172371
$ 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:04:13] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:13] tidy error: /checkout/src/librustc/middle/stability.rs:292: line longer than 100 chars
[00:04:14] some tidy checks failed
[00:04:14] 
[00:04:14] 
[00:04:14] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:14] 
[00:04:14] 
[00:04:14] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:14] Build completed unsuccessfully in 0:00:46
[00:04:14] Build completed unsuccessfully in 0:00:46
[00:04:14] make: *** [tidy] Error 1
[00:04:14] Makefile:68: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:243c2d72
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Mon Feb 18 15:55:09 UTC 2019
---
travis_time:end:0ce4dade:start=1550505310063858333,finish=1550505310068388008,duration=4529675
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:03b9d959
$ 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:0ff4466a
travis_time:start:0ff4466a
$ 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:01acfb53
$ 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)

@ljedrz ljedrz changed the title HirId-ify some nodes Remove NodeId from some HIR nodes Feb 18, 2019
@bors
Copy link
Contributor

bors commented Feb 19, 2019

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

@Zoxc
Copy link
Contributor

Zoxc commented Feb 19, 2019

These changes look good to me.

@bors delegate+

@bors
Copy link
Contributor

bors commented Feb 19, 2019

✌️ @ljedrz can now approve this pull request

@rust-highfive
Copy link
Collaborator

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:0790de7a:start=1550603541944574983,finish=1550603679680686988,duration=137736112005
$ 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:06:09] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:06:10] tidy error: /checkout/src/librustdoc/clean/mod.rs:2632: tab character
[00:06:11] some tidy checks failed
[00:06:11] 
[00:06:11] 
[00:06:11] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:06:11] 
[00:06:11] 
[00:06:11] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:06:11] Build completed unsuccessfully in 0:00:45
[00:06:11] Build completed unsuccessfully in 0:00:45
[00:06:11] make: *** [tidy] Error 1
[00:06:11] Makefile:68: recipe for target 'tidy' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:06a5790e
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Feb 19 19:21:01 UTC 2019
---
travis_time:end:06d7eeec:start=1550604062077196475,finish=1550604062081578725,duration=4382250
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:096a44c0
$ 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:067cac4c
travis_time:start:067cac4c
$ 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:19fa23c8
$ 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
Copy link
Contributor

bors commented Feb 23, 2019

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

@ljedrz
Copy link
Contributor Author

ljedrz commented Feb 24, 2019

@bors r=Zoxc

@bors
Copy link
Contributor

bors commented Feb 24, 2019

📌 Commit 63b4dd9 has been approved by Zoxc

@bors 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 24, 2019
@ljedrz ljedrz mentioned this pull request Feb 24, 2019
2 tasks
@bors 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 24, 2019
@ljedrz
Copy link
Contributor Author

ljedrz commented Feb 24, 2019

Blocked by rust-lang/rust-clippy#3814.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools 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:25cf9d58:start=1551042031185801905,finish=1551042121772123790,duration=90586321885
$ 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-tools

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
Copy link
Contributor Author

ljedrz commented Feb 25, 2019

The build stalled; might be spurious. I'm not sure if reopening will retry Travis; lemme see...

edit: yep, that did the trick.

@ljedrz ljedrz closed this Feb 25, 2019
@ljedrz ljedrz reopened this Feb 25, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools 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:09de66bd:start=1551074638382806590,finish=1551074725619953484,duration=87237146894
$ 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-tools
---
[01:24:02] test [ui] ui/assign_ops2.rs ... test [ui] ui/assign_ops2.rs has been running for over 60 seconds
[01:24:04] test [ui] ui/block_in_if_condition.rs ... test [ui] ui/block_in_if_condition.rs has been running for over 60 seconds
[01:24:06] test [ui] ui/borrow_box.rs ... test [ui] ui/borrow_box.rs has been running for over 60 seconds
[01:24:06] test [ui] ui/box_vec.rs ... test [ui] ui/box_vec.rs has been running for over 60 seconds
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

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
Copy link
Contributor Author

ljedrz commented Feb 25, 2019

The tooltest error seems legit; I'll look into it.

edit: clippy updated, retrying.

@ljedrz
Copy link
Contributor Author

ljedrz commented Feb 25, 2019

@bors r=Zoxc

@bors
Copy link
Contributor

bors commented Feb 25, 2019

📌 Commit 77a30ec has been approved by Zoxc

@bors 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 25, 2019
@ljedrz
Copy link
Contributor Author

ljedrz commented Feb 25, 2019

Can I get a priority bump to 1 due to submodule update?

@Centril
Copy link
Contributor

Centril commented Feb 25, 2019

Rollup fairness (due to submodule update), @bors p=1

@bors
Copy link
Contributor

bors commented Feb 26, 2019

⌛ Testing commit 77a30ec with merge ea43c3c...

bors added a commit that referenced this pull request Feb 26, 2019
Remove NodeId from some HIR nodes

The next iteration of #57578.

Removes `NodeId` from:

- [x] `Lifetime`
- [x] `Ty`
- [x] `GenericParam`
- [x] `WhereClause`
- [x] `WhereEqPredicate`
- [x] `MacroDef`
- [x] `Block`
- [x] `Expr`

r? @Zoxc
@bors
Copy link
Contributor

bors commented Feb 26, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Zoxc
Pushing ea43c3c to master...

1 similar comment
@bors
Copy link
Contributor

bors commented Feb 26, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Zoxc
Pushing ea43c3c to master...

@bors bors merged commit 77a30ec into rust-lang:master Feb 26, 2019
@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 26, 2019
@ljedrz ljedrz deleted the HirIdify_some_nodes branch February 26, 2019 09:01
bors added a commit to rust-lang/rust-clippy that referenced this pull request Feb 26, 2019
HirIdify some lints

Unblocks rust-lang/rust#58561 (a part of [rust-lang/rust#57578](rust-lang/rust#57578)). Can we branch it like with #3790? I can rebase on a different commit if need be.

Haven't had time to run tests yet, so I'd wait for Travis 🙈.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants