Skip to content

Point at end of macro arm when encountering EOF #55402

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

Merged
merged 7 commits into from
Nov 27, 2018

Conversation

estebank
Copy link
Contributor

Fix #52866.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 26, 2018
@estebank estebank added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 5, 2018
@rust-highfive

This comment has been minimized.

@estebank
Copy link
Contributor Author

estebank commented Nov 6, 2018

@nikomatsakis Some of this is very hacky, but I feel that the results are really worth it (and difficult to accomplish in a cleaner way without a large refactor).

These are the representative output to look at:

https://github.com/rust-lang/rust/pull/55402/files#diff-453bf49f4eab03f41a4f7a20c084b3c5
https://github.com/rust-lang/rust/pull/55402/files#diff-cd2612a6b8b62c5dbf63078873af0ffc
https://github.com/rust-lang/rust/pull/55402/files#diff-e92d884451d7aba4a234400faed2cff5
https://github.com/rust-lang/rust/pull/55402/files#diff-1d3cccb183f9a24871ea6f0d4321788b

I refrained from further complicating the code to handle the last one with a custom diagnostic because I feel that it is enough of an improvement as it is. (If you disagree, it can certainly be expanded.)

Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good. The results are indeed good. I still feel like the message can get better but I'm not sure that what I proposed is an improvement exactly. Thoughts?

@nikomatsakis

This comment has been minimized.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 26, 2018

📌 Commit d011313 has been approved by nikomatsakis

@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 Nov 26, 2018
@bors
Copy link
Collaborator

bors commented Nov 27, 2018

⌛ Testing commit d011313 with merge f52204ce1b664dcc16ada1ee65284c4cde7b24ba...

@bors
Copy link
Collaborator

bors commented Nov 27, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Contributor

The job dist-armv7-linux 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.
Building stage2 tool cargo (armv7-unknown-linux-gnueabihf)
[01:10:47]  Downloading crates ...
[01:11:07] warning: spurious network error (2 tries remaining): [6] Couldn't resolve host name (Could not resolve host: crates.io)
[01:11:27] warning: spurious network error (1 tries remaining): [6] Couldn't resolve host name (Could not resolve host: crates.io)
[01:11:47] error: failed to download from `https://crates.io/api/v1/crates/openssl-src/111.0.1+1.1.1/download`
[01:11:47] Caused by:
[01:11:47]   [6] Couldn't resolve host name (Could not resolve host: crates.io)
[01:11:47] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "armv7-unknown-linux-gnueabihf" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/cargo/Cargo.toml" "--features" "rustc-workspace-hack/all-static" "--message-format" "json"
[01:11:47] expected success, got: exit code: 101
---
travis_time:end:0168e56e:start=1543300439091560957,finish=1543300439101956914,duration=10395957
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:01f722e5
$ 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:0ef126a6
travis_time:start:0ef126a6
$ 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:02d6fc2e
$ 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 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 Nov 27, 2018
@kennytm
Copy link
Member

kennytm commented Nov 27, 2018

@bors retry travis-ci/travis-ci#9696

@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 Nov 27, 2018
@kennytm
Copy link
Member

kennytm commented Nov 27, 2018

@bors p=29

rollup fairness

bors added a commit that referenced this pull request Nov 27, 2018
Point at end of macro arm when encountering EOF

Fix #52866.
@bors
Copy link
Collaborator

bors commented Nov 27, 2018

⌛ Testing commit d011313 with merge 10e2c72...

@bors
Copy link
Collaborator

bors commented Nov 27, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 10e2c72 to master...

@bors bors merged commit d011313 into rust-lang:master Nov 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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