Skip to content
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

Update pulldown-cmark dependency #69164

Merged
merged 1 commit into from
Feb 15, 2020

Conversation

GuillaumeGomez
Copy link
Member

r? @kinnison

cc @ollie27

Reopening of #65894.

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 14, 2020
@Dylan-DPC-zz
Copy link

@bors r+

@bors
Copy link
Contributor

bors commented Feb 14, 2020

📌 Commit 26275db195d27c9b0933f22910cdc1c25bc7c91e has been approved by Dylan-DPC

@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 Feb 14, 2020
@@ -65,7 +65,8 @@ warning: could not parse code block as Rust code
LL | /// code with bad syntax
| _________^
LL | | /// \_
| |__________^
LL | | ///
| |_
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a diagnostic regression.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm actually not able to understand the original behavior. The first line is supposed to be the one triggering the error so I don't understand why we had an arrow for the second as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

The span is intended to contain the codeblock in the markdown exactly. Here, it includes the first / of the next line of the doc comment.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh I see! Great catch!

@GuillaumeGomez
Copy link
Member Author

The span isn't correctly fulfilled.

@bors: r-

@bors 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 Feb 14, 2020
@GuillaumeGomez
Copy link
Member Author

Ok, no more diff with the current tests. Then I guess we can continue?

@bors: r=Dylan-DPC

@bors
Copy link
Contributor

bors commented Feb 14, 2020

📌 Commit d8589de has been approved by Dylan-DPC

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 14, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 14, 2020
…k, r=Dylan-DPC

Update pulldown-cmark dependency

r? @kinnison

cc @ollie27

Reopening of  rust-lang#65894.
bors added a commit that referenced this pull request Feb 14, 2020
Rollup of 7 pull requests

Successful merges:

 - #68129 (Correct inference of primitive operand type behind binary operation)
 - #68475 (Use a `ParamEnvAnd<Predicate>` for caching in `ObligationForest`)
 - #68856 (typeck: clarify def_bm adjustments & add tests for or-patterns)
 - #69051 (simplify_try: address some of eddyb's comments)
 - #69128 (Fix extra subslice lowering)
 - #69150 (Follow-up to #68848)
 - #69164 (Update pulldown-cmark dependency)

Failed merges:

r? @ghost
@bors bors merged commit d8589de into rust-lang:master Feb 15, 2020
@GuillaumeGomez GuillaumeGomez deleted the update-pulldown-cmark branch February 15, 2020 15:01
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.

6 participants