-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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 invalid span generation when it should be div #64175
Merged
bors
merged 1 commit into
rust-lang:master
from
GuillaumeGomez:replace-span-when-it-should-be-div
Sep 6, 2019
Merged
Fix invalid span generation when it should be div #64175
bors
merged 1 commit into
rust-lang:master
from
GuillaumeGomez:replace-span-when-it-should-be-div
Sep 6, 2019
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
JohnTitor
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Sep 5, 2019
Interesting. I guess it seems fine. @bors r+ rollup |
📌 Commit d4d5aa4 has been approved by |
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
Sep 5, 2019
Centril
added a commit
to Centril/rust
that referenced
this pull request
Sep 5, 2019
…-should-be-div, r=Mark-Simulacrum Fix invalid span generation when it should be div Fixes rust-lang#64146. It changes basically nothing in the display... Can be checked with: ```rust pub enum X { /// Some doc? /// /// with lines! Foo { /// a /// /// b x: u32, /// Doc! /// /// ``` /// yolo /// ``` y: String, }, /// Doc! /// /// ``` /// yolo /// ``` Bar(String), } ``` r? @Mark-Simulacrum
Centril
added a commit
to Centril/rust
that referenced
this pull request
Sep 5, 2019
…-should-be-div, r=Mark-Simulacrum Fix invalid span generation when it should be div Fixes rust-lang#64146. It changes basically nothing in the display... Can be checked with: ```rust pub enum X { /// Some doc? /// /// with lines! Foo { /// a /// /// b x: u32, /// Doc! /// /// ``` /// yolo /// ``` y: String, }, /// Doc! /// /// ``` /// yolo /// ``` Bar(String), } ``` r? @Mark-Simulacrum
bors
added a commit
that referenced
this pull request
Sep 5, 2019
Rollup of 5 pull requests Successful merges: - #63676 (Use wasi crate for Core API) - #64094 (Improve searching in rustdoc and add tests) - #64111 (or-patterns: Uniformly use `PatKind::Or` in AST & Fix/Cleanup resolve) - #64156 (Assume non-git LLVM is fresh if the stamp file exists) - #64175 (Fix invalid span generation when it should be div) Failed merges: - #63806 (Upgrade rand to 0.7) r? @ghost
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Sep 6, 2019
…-should-be-div, r=Mark-Simulacrum Fix invalid span generation when it should be div Fixes rust-lang#64146. It changes basically nothing in the display... Can be checked with: ```rust pub enum X { /// Some doc? /// /// with lines! Foo { /// a /// /// b x: u32, /// Doc! /// /// ``` /// yolo /// ``` y: String, }, /// Doc! /// /// ``` /// yolo /// ``` Bar(String), } ``` r? @Mark-Simulacrum
Centril
added a commit
to Centril/rust
that referenced
this pull request
Sep 6, 2019
…-should-be-div, r=Mark-Simulacrum Fix invalid span generation when it should be div Fixes rust-lang#64146. It changes basically nothing in the display... Can be checked with: ```rust pub enum X { /// Some doc? /// /// with lines! Foo { /// a /// /// b x: u32, /// Doc! /// /// ``` /// yolo /// ``` y: String, }, /// Doc! /// /// ``` /// yolo /// ``` Bar(String), } ``` r? @Mark-Simulacrum
bors
added a commit
that referenced
this pull request
Sep 6, 2019
Rollup of 10 pull requests Successful merges: - #63676 (Use wasi crate for Core API) - #64094 (Improve searching in rustdoc and add tests) - #64111 (or-patterns: Uniformly use `PatKind::Or` in AST & Fix/Cleanup resolve) - #64156 (Assume non-git LLVM is fresh if the stamp file exists) - #64161 (Point at variant on pattern field count mismatch) - #64174 (Add missing code examples on Iterator trait) - #64175 (Fix invalid span generation when it should be div) - #64186 (std: Improve downstream codegen in `Command::env`) - #64190 (fill metadata in rustc_lexer's Cargo.toml) - #64198 (Add Fuchsia to actually_monotonic) Failed merges: r? @ghost
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.
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.
Fixes #64146.
It changes basically nothing in the display... Can be checked with:
r? @Mark-Simulacrum