fix intra-link resolution spans in block comments by euclio · Pull Request #56010 · rust-lang/rust

euclio · 2018-11-16T19:59:50Z

This commit improves the calculation of code spans for intra-doc
resolution failures. All sugared doc comments should now have the
correct spans, including those where the comment is longer than the
docs.

It also fixes an issue where the spans were calculated incorrectly for
certain unsugared doc comments. The diagnostic will now always use the
span of the attributes, as originally intended.

Fixes#55964.

r? @QuietMisdreavus

QuietMisdreavus

This is brilliant, thank you so much! I was expecting the fix to be more complicated than this, but your PR is great!

QuietMisdreavus · 2018-11-16T21:57:21Z

@bors r+

bors · 2018-11-16T21:57:22Z

📌 Commit 9893407d87e81c2069ca06c416d316adbf562946 has been approved by QuietMisdreavus

bors · 2018-11-19T17:05:42Z

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

euclio · 2018-11-19T20:32:34Z

@QuietMisdreavus Rebased.

euclio · 2018-11-26T16:03:33Z

Ping @QuietMisdreavus

QuietMisdreavus · 2018-12-03T20:09:59Z

@bors r+

bors · 2018-12-03T20:10:00Z

📌 Commit ea5843c has been approved by QuietMisdreavus

…reavus fix intra-link resolution spans in block comments This commit improves the calculation of code spans for intra-doc resolution failures. All sugared doc comments should now have the correct spans, including those where the comment is longer than the docs. It also fixes an issue where the spans were calculated incorrectly for certain unsugared doc comments. The diagnostic will now always use the span of the attributes, as originally intended. Fixesrust-lang#55964.

euclio · 2018-12-06T20:04:50Z

@QuietMisdreavus Added a test and made sure the compiler docs can be generated successfully. I think this solution is cleaner than the original, too!

euclio · 2018-12-11T04:00:53Z

@QuietMisdreavus Ok, I think this is ready for bors to have another whack at it.

QuietMisdreavus · 2018-12-11T19:56:20Z

Curious about what caused that error in the first place, but if we can get around it, that's probably best for now. The new code looks good, so here goes...

@bors r+

bors · 2018-12-11T19:56:21Z

📌 Commit 56413ec has been approved by QuietMisdreavus

bors · 2018-12-11T23:28:17Z

⌛ Testing commit 56413ec with merge c4b3fc4bc2f0f9e068c9bf5b6bba2f0f240fd7d0...

bors · 2018-12-11T23:30:05Z

💔 Test failed - status-appveyor

rust-highfive · 2018-12-11T23:32:10Z

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.

Checking out files: 100% (17616/17616), done.
travis_time:end:3a0fcb18:start=1544571021577328000,finish=1544571032075818000,duration=10498490000
$ cd rust-lang/rust
$ git checkout -qf c4b3fc4bc2f0f9e068c9bf5b6bba2f0f240fd7d0
fatal: reference is not a tree: c4b3fc4bc2f0f9e068c9bf5b6bba2f0f240fd7d0
The command "git checkout -qf c4b3fc4bc2f0f9e068c9bf5b6bba2f0f240fd7d0" failed and exited with 128 during .
Your build has been stopped.

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)

alexcrichton · 2018-12-11T23:47:14Z

@bors: retry

CI automation hiccup

bors · 2018-12-12T00:09:05Z

⌛ Testing commit 56413ec with merge 6375777bb438d115b298003e93197110f881bba0...

bors · 2018-12-12T00:23:22Z

💔 Test failed - status-appveyor

alexcrichton · 2018-12-12T01:13:39Z

@bors: retry

bors · 2018-12-12T08:18:19Z

⌛ Testing commit 56413ec with merge a64cdec...

@QuietMisdreavus

fix intra-link resolution spans in block comments This commit improves the calculation of code spans for intra-doc resolution failures. All sugared doc comments should now have the correct spans, including those where the comment is longer than the docs. It also fixes an issue where the spans were calculated incorrectly for certain unsugared doc comments. The diagnostic will now always use the span of the attributes, as originally intended. Fixes#55964. r? @QuietMisdreavus

bors · 2018-12-12T10:44:28Z

☀️ Test successful - status-appveyor, status-travis
Approved by: QuietMisdreavus
Pushing a64cdec to master...

rust-highfive assigned QuietMisdreavus Nov 16, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 16, 2018

euclio force-pushed the intra-doc-spans branch from cefcfce to 9893407Compare November 16, 2018 20:03

QuietMisdreavus approved these changes Nov 16, 2018
View reviewed changes

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 16, 2018

kennytm mentioned this pull request Nov 17, 2018
Rollup of 17 pull requests #56026
Closed

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 Nov 19, 2018

euclio force-pushed the intra-doc-spans branch from 9893407 to ea5843cCompare November 19, 2018 20:30

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 Dec 3, 2018

GuillaumeGomez mentioned this pull request Dec 5, 2018
Rollup of 19 pull requests #56531
Closed

ollie27 reviewed Dec 5, 2018
View reviewed changes

Comment threadsrc/librustdoc/passes/collect_intra_doc_links.rs Outdated

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 Dec 5, 2018

ollie27 mentioned this pull request Dec 5, 2018
rustbuild: Fix issues with compiler docs #56441
Merged

euclio force-pushed the intra-doc-spans branch from ea5843c to 5ba7a0eCompare December 6, 2018 19:56

QuietMisdreavus reviewed Dec 6, 2018
View reviewed changes

Comment threadsrc/librustdoc/passes/collect_intra_doc_links.rs Outdated

euclio changed the title ~~[WIP] fix intra-link resolution spans in block comments~~fix intra-link resolution spans in block commentsDec 11, 2018

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 Dec 11, 2018

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 Dec 11, 2018

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 Dec 11, 2018

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 Dec 12, 2018

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 Dec 12, 2018

bors merged commit 56413ec into rust-lang:masterDec 12, 2018

euclio deleted the intra-doc-spans branch December 12, 2018 13:35

SimonSapin mentioned this pull request Dec 27, 2018
Call poly_project_and_unify_type on types that contain inference types #56838
Merged

bryanburgers mentioned this pull request May 29, 2019
Remove support for bors commands in review comments rust-lang/homu#41
Closed

Uh oh!

Uh oh!

Conversation

euclio commented Nov 16, 2018

Uh oh!

QuietMisdreavus left a comment

Choose a reason for hiding this comment

Uh oh!

QuietMisdreavus commented Nov 16, 2018

Uh oh!

bors commented Nov 16, 2018

Uh oh!

bors commented Nov 19, 2018

Uh oh!

euclio commented Nov 19, 2018

Uh oh!

euclio commented Nov 26, 2018

Uh oh!

QuietMisdreavus commented Dec 3, 2018

Uh oh!

bors commented Dec 3, 2018

Uh oh!

Uh oh!

euclio commented Dec 6, 2018

Uh oh!

Uh oh!

euclio commented Dec 11, 2018

Uh oh!

QuietMisdreavus commented Dec 11, 2018

Uh oh!

bors commented Dec 11, 2018

Uh oh!

bors commented Dec 11, 2018

Uh oh!

bors commented Dec 11, 2018

Uh oh!

rust-highfive commented Dec 11, 2018

Uh oh!

alexcrichton commented Dec 11, 2018

Uh oh!

bors commented Dec 12, 2018

Uh oh!

bors commented Dec 12, 2018

Uh oh!

alexcrichton commented Dec 12, 2018

Uh oh!

bors commented Dec 12, 2018

Uh oh!

bors commented Dec 12, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants