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

Fix line numbers display #56498

Merged
merged 1 commit into from Dec 6, 2018

Conversation

Projects
None yet
5 participants
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Dec 4, 2018

Thanks to @talchas for finding the bug and suggesting the solution!

r? @QuietMisdreavus

@QuietMisdreavus
Copy link
Member

QuietMisdreavus left a comment

Ah, good catch!

@QuietMisdreavus

This comment has been minimized.

Copy link
Member

QuietMisdreavus commented Dec 4, 2018

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 4, 2018

📌 Commit e41e85c has been approved by QuietMisdreavus

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 4, 2018

Rollup merge of rust-lang#56498 - GuillaumeGomez:line-numbers, r=Quie…
…tMisdreavus

Fix line numbers display

Thanks to @talchas for finding the bug and suggesting the solution!

r? @QuietMisdreavus

bors added a commit that referenced this pull request Dec 4, 2018

Auto merge of #56521 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 15 pull requests

Successful merges:

 - #51753 (Document `From` implementations)
 - #55519 (Add example of using the indexing operator to HashMap docs)
 - #55563 (Improve no result found sentence in doc search)
 - #55987 (Add Weak.ptr_eq)
 - #56119 (Utilize `?` instead of `return None`.)
 - #56332 ([rustdoc] Specific crate search)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56388 (More MIR borrow check cleanup)
 - #56424 (Mention raw-ident syntax)
 - #56452 (Remove redundant clones)
 - #56456 (Handle existential types in dead code analysis)
 - #56466 (data_structures: remove tuple_slice)
 - #56476 (Fix invalid line number match)
 - #56497 (cleanup: remove static lifetimes from consts in libstd)
 - #56498 (Fix line numbers display)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Dec 5, 2018

Auto merge of #56521 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 15 pull requests

Successful merges:

 - #51753 (Document `From` implementations)
 - #55519 (Add example of using the indexing operator to HashMap docs)
 - #55563 (Improve no result found sentence in doc search)
 - #55987 (Add Weak.ptr_eq)
 - #56119 (Utilize `?` instead of `return None`.)
 - #56332 ([rustdoc] Specific crate search)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56388 (More MIR borrow check cleanup)
 - #56424 (Mention raw-ident syntax)
 - #56452 (Remove redundant clones)
 - #56456 (Handle existential types in dead code analysis)
 - #56466 (data_structures: remove tuple_slice)
 - #56476 (Fix invalid line number match)
 - #56497 (cleanup: remove static lifetimes from consts in libstd)
 - #56498 (Fix line numbers display)

Failed merges:

r? @ghost

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 5, 2018

Rollup merge of rust-lang#56498 - GuillaumeGomez:line-numbers, r=Quie…
…tMisdreavus

Fix line numbers display

Thanks to @talchas for finding the bug and suggesting the solution!

r? @QuietMisdreavus

bors added a commit that referenced this pull request Dec 5, 2018

Auto merge of #56531 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 19 pull requests

Successful merges:

 - #51753 (Document `From` implementations)
 - #55563 (Improve no result found sentence in doc search)
 - #55933 (emit error when doc generation fails)
 - #55987 (Add Weak.ptr_eq)
 - #56119 (Utilize `?` instead of `return None`.)
 - #56250 (Introduce ptr::hash for references)
 - #56332 ([rustdoc] Specific crate search)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56388 (More MIR borrow check cleanup)
 - #56424 (Mention raw-ident syntax)
 - #56441 (rustbuild: Fix issues with compiler docs)
 - #56452 (Remove redundant clones)
 - #56456 (Handle existential types in dead code analysis)
 - #56466 (data_structures: remove tuple_slice)
 - #56476 (Fix invalid line number match)
 - #56497 (cleanup: remove static lifetimes from consts in libstd)
 - #56498 (Fix line numbers display)
 - #56523 (Added a bare-bones eslint config (removing jslint))
 - #56525 (Avoid extra copy and syscall in std::env::current_exe)

bors added a commit that referenced this pull request Dec 5, 2018

Auto merge of #56531 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 19 pull requests

Successful merges:

 - #51753 (Document `From` implementations)
 - #55563 (Improve no result found sentence in doc search)
 - #55987 (Add Weak.ptr_eq)
 - #56010 (fix intra-link resolution spans in block comments)
 - #56119 (Utilize `?` instead of `return None`.)
 - #56250 (Introduce ptr::hash for references)
 - #56332 ([rustdoc] Specific crate search)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56388 (More MIR borrow check cleanup)
 - #56424 (Mention raw-ident syntax)
 - #56441 (rustbuild: Fix issues with compiler docs)
 - #56452 (Remove redundant clones)
 - #56456 (Handle existential types in dead code analysis)
 - #56466 (data_structures: remove tuple_slice)
 - #56476 (Fix invalid line number match)
 - #56497 (cleanup: remove static lifetimes from consts in libstd)
 - #56498 (Fix line numbers display)
 - #56523 (Added a bare-bones eslint config (removing jslint))
 - #56525 (Avoid extra copy and syscall in std::env::current_exe)

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Dec 5, 2018

Rollup merge of rust-lang#56498 - GuillaumeGomez:line-numbers, r=Quie…
…tMisdreavus

Fix line numbers display

Thanks to @talchas for finding the bug and suggesting the solution!

r? @QuietMisdreavus

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Dec 5, 2018

Rollup merge of rust-lang#56498 - GuillaumeGomez:line-numbers, r=Quie…
…tMisdreavus

Fix line numbers display

Thanks to @talchas for finding the bug and suggesting the solution!

r? @QuietMisdreavus

bors added a commit that referenced this pull request Dec 5, 2018

Auto merge of #56549 - pietroalbini:rollup, r=pietroalbini
Rollup of 15 pull requests

Successful merges:

 - #51753 (Document `From` implementations)
 - #55563 (Improve no result found sentence in doc search)
 - #55987 (Add Weak.ptr_eq)
 - #56119 (Utilize `?` instead of `return None`.)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56388 (More MIR borrow check cleanup)
 - #56424 (Mention raw-ident syntax)
 - #56452 (Remove redundant clones)
 - #56456 (Handle existential types in dead code analysis)
 - #56466 (data_structures: remove tuple_slice)
 - #56476 (Fix invalid line number match)
 - #56497 (cleanup: remove static lifetimes from consts in libstd)
 - #56498 (Fix line numbers display)
 - #56523 (Added a bare-bones eslint config (removing jslint))
 - #56538 (Use inner iterator may_have_side_effect for Cloned)

Failed merges:

r? @ghost

@bors bors merged commit e41e85c into rust-lang:master Dec 6, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@GuillaumeGomez GuillaumeGomez deleted the GuillaumeGomez:line-numbers branch Dec 6, 2018

@QuietMisdreavus

This comment has been minimized.

Copy link
Member

QuietMisdreavus commented Dec 14, 2018

@rust-lang/rustdoc Nominating for backport because the issue this solves is on beta and the fix is small.

Immediately accepting based on #56720 (comment)

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