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.

Sign up for GitHub

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

Jump to bottom

Allow for parentheses after macro intra-doc-links #73791

Merged
merged 2 commits into from
Jul 10, 2020
Merged

Allow for parentheses after macro intra-doc-links #73791

merged 2 commits into from
Jul 10, 2020

Conversation

Manishearth
Copy link
Member

No description provided.

@rust-highfive
Copy link
Collaborator

r? @GuillaumeGomez

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 27, 2020
@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 9, 2020

📌 Commit 1ab8260494e31a214ad16a1278855d031698e399 has been approved by GuillaumeGomez

@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 Jul 9, 2020
@ollie27
Copy link
Member

ollie27 commented Jul 9, 2020

Shouldn't a test be added for this?

@GuillaumeGomez
Copy link
Member

Outch, good catch @ollie27 !

Please add a test @Manishearth.

@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 Jul 9, 2020
@Manishearth
Copy link
Member Author

@ollie27 we mostly don't have tests for this kind of thing, i was considering adding them separately, but i can do that

@Manishearth
Copy link
Member Author

I was wrong, we do test this, it was just part of another test.

@Manishearth
Copy link
Member Author

@bors r=GuillaumeGomez,jyn514 rollup

@bors
Copy link
Contributor

bors commented Jul 9, 2020

📌 Commit fe351e9 has been approved by GuillaumeGomez,jyn514

@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 Jul 9, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 9, 2020
@Manishearth
Rollup merge of rust-lang#73791 - Manishearth:parens-intra-doc, r=Gui…
e7cdc83 
…llaumeGomez,jyn514

Allow for parentheses after macro intra-doc-links

None
@Manishearth Manishearth mentioned this pull request Jul 9, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 9, 2020
@Manishearth
Rollup merge of rust-lang#73791 - Manishearth:parens-intra-doc, r=Gui…
c191cd1 
…llaumeGomez,jyn514

Allow for parentheses after macro intra-doc-links

None
@Manishearth Manishearth mentioned this pull request Jul 9, 2020
Closed
@Manishearth Manishearth mentioned this pull request Jul 9, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 9, 2020
@bors
Auto merge of rust-lang#74195 - Manishearth:rollup-h3m0sl8, r=Manishe…
e59b08e 
…arth

Rollup of 14 pull requests

Successful merges:

 - rust-lang#73292 (Fixing broken link for the Eq trait)
 - rust-lang#73791 (Allow for parentheses after macro intra-doc-links)
 - rust-lang#74070 ( Use for<'tcx> fn pointers in Providers, instead of having Providers<'tcx>.)
 - rust-lang#74077 (Use relative path for local links to primitives)
 - rust-lang#74079 (Eliminate confusing "globals" terminology.)
 - rust-lang#74107 (Hide `&mut self` methods from Deref in sidebar if there are no `DerefMut` impl for the type.)
 - rust-lang#74136 (Fix broken link in rustdocdoc)
 - rust-lang#74137 (Update cargo)
 - rust-lang#74142 (Liballoc use vec instead of vector)
 - rust-lang#74143 (Try remove unneeded ToString import in liballoc slice)
 - rust-lang#74146 (update miri)
 - rust-lang#74150 (Avoid "blacklist")
 - rust-lang#74184 (Add docs for intra-doc-links)
 - rust-lang#74188 (Tweak `::` -> `:` typo heuristic and reduce verbosity)

Failed merges:

 - rust-lang#74122 (Start-up clean-up)
 - rust-lang#74127 (Avoid "whitelist")

r? @ghost
@Manishearth
Copy link
Member Author

@bors p=5

trying something

@Manishearth
Copy link
Member Author

@bors p=0

@bors bors merged commit d163524 into rust-lang:master Jul 10, 2020
@Manishearth Manishearth deleted the parens-intra-doc branch July 18, 2020 01:14
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 approved these changes

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.46
Development

Successfully merging this pull request may close these issues.
7 participants
@Manishearth @rust-highfive @GuillaumeGomez @bors @ollie27 @jyn514 @cuviper