Skip to content

use proper footnote syntax for references - #52164

Merged
bors merged 1 commit into
rust-lang:masterfrom
euclio:references
Jul 12, 2018
Merged

use proper footnote syntax for references#52164
bors merged 1 commit into
rust-lang:masterfrom
euclio:references

Conversation

@euclio

Copy link
Copy Markdown
Contributor

The previous syntax was causing rustdoc to interpret them as links.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @TimNN

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 8, 2018
@TimNN

TimNN commented Jul 9, 2018

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jul 9, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 2371782 has been approved by TimNN

@borsbors 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, 2018
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 10, 2018
use proper footnote syntax for references
The previous syntax was causing rustdoc to interpret them as links.
bors added a commit that referenced this pull request Jul 10, 2018
Rollup of 7 pull requests
Successful merges:
- #51612 (NLL: fix E0594 "change to mutable ref" suggestion)
- #51722 (Updated RELEASES for 1.28.0)
- #52064 (Clarifying how the alignment of the struct works)
- #52149 (Add #[repr(transparent)] to Atomic* types)
- #52151 (Trait impl settings)
- #52171 (Correct some codegen stats counter inconsistencies)
- #52195 (rustc: Avoid /tmp/ in graphviz writing)
Failed merges:
- #52164 (use proper footnote syntax for references)
r? @ghost
@bors

bors commented Jul 11, 2018

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #52229) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors 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 11, 2018
The previous syntax was causing rustdoc to interpret them as links.
@euclio

Copy link
Copy Markdown
ContributorAuthor

@TimNN rebased

@kennytm

Copy link
Copy Markdown
Member

@bors r=TimNN rollup

@bors

bors commented Jul 11, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit f5f21aa has been approved by TimNN

@borsbors 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 11, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Jul 12, 2018
use proper footnote syntax for references
The previous syntax was causing rustdoc to interpret them as links.
@kennytmkennytm mentioned this pull request Jul 12, 2018
bors added a commit that referenced this pull request Jul 12, 2018
Rollup of 9 pull requests
Successful merges:
- #51816 (bootstrap: write texts to a .tmp file first for atomicity)
- #51912 (impl Clone for Box<CStr>, Box<OsStr>, Box<Path>)
- #52164 (use proper footnote syntax for references)
- #52220 (Deny bare trait objects in `src/bootstrap`)
- #52276 (rustc: Verify #[proc_macro] is only a word)
- #52277 (Uncapitalize "If")
- #52287 (Deny bare trait objects in src/librustc_resolve)
- #52295 (Deny bare trait objects in src/libsyntax_ext)
- #52298 (make reference to dirs crate clickable in terminals)
Failed merges:
r? @ghost
@bors
bors merged commit f5f21aa into rust-lang:masterJul 12, 2018
@euclio
euclio deleted the references branch July 12, 2018 15:24
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

5 participants

@euclio@rust-highfive@TimNN@bors@kennytm