Fix needless_doctest_main span #5241
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
ICE seems unrelated. Probably #5238. |
|
Yeah, the failure is unrelated. And I noticed AppVeyor still lives for branch CI, not only master :/ We can say goodbye to them completely by removing AppVeyor's project iirc. |
JohnTitor
added
the
S-waiting-on-review
llogiq
force-pushed
the
needless-doc-main-span
branch
from
75d19db to
92f5c73
Compare
flip1995
reviewed
Mar 3, 2020
flip1995
added
S-waiting-on-author
llogiq
force-pushed
the
needless-doc-main-span
branch
from
92f5c73 to
baae1f9
Compare
|
☔ The latest upstream changes (presumably #5259) made this pull request unmergeable. Please resolve the merge conflicts. |
llogiq
force-pushed
the
needless-doc-main-span
branch
from
baae1f9 to
a45af45
Compare
flip1995
reviewed
Mar 3, 2020
clippy_lints/src/doc.rs
Outdated
| let lo = span.lo() + BytePos::from_usize(range.start - begin); | ||
| // we need a span that includes at least the code. | ||
| // however, because we have already stripped the comment | ||
| // prefixes, we need to add their size back. We currently |
There was a problem hiding this comment.
Suggested change
| // prefixes, we need to add their size back. We currently | |
| // prefixes (`/// `), we need to add their size back. We currently |
Took me way too long to figure out what you meant by "comment prefixes". Can you add this for people like me? 😄
There was a problem hiding this comment.
Sure. I'm rebuilding the branch anyway, because somehow a rebase went wrong.
flip1995
reviewed
Mar 3, 2020
| @@ -67,7 +67,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NoNegCompOpForPartialOrd { | |||
| }; | |||
|
|
|||
| let implements_partial_ord = { | |||
| if let Some(id) = utils::get_trait_def_id(cx, &paths::PARTIAL_ORD) { | |||
| if let Some(id) = cx.tcx.lang_items().partial_ord_trait() { | |||
There was a problem hiding this comment.
Seems like something gone wrong with the rebase?
llogiq
force-pushed
the
needless-doc-main-span
branch
from
a45af45 to
74eae9d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First, I extend the ranges, not just the text when I coalesce two events and second: I use this (and work around the removed prefixes by counting the newlines and multiplying by 4, which is admittedly a bit hacky) when finding the
fn main().This fixes #5236.
changelog: none