Skip to content

rename cfg(rustdoc) into cfg(doc) - #66166

Merged
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:rename-rustdoc-to-doc
Nov 13, 2019
Merged

rename cfg(rustdoc) into cfg(doc)#66166
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:rename-rustdoc-to-doc

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

@JohnTitorJohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 6, 2019
@Dylan-DPC-zz

Copy link
Copy Markdown

r? @Dylan-DPC

@QuietMisdreavusQuietMisdreavus left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for getting the docs and comments too!

@QuietMisdreavus

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 12, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 0282c27 has been approved by QuietMisdreavus

@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 Nov 12, 2019
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 13, 2019
…c, r=QuietMisdreavus
rename cfg(rustdoc) into cfg(doc)
Needed by rust-lang#61351
r? @QuietMisdreavus
@JohnTitorJohnTitor mentioned this pull request Nov 13, 2019
bors added a commit that referenced this pull request Nov 13, 2019
Rollup of 13 pull requests
Successful merges:
- #65932 (download .tar.xz if python3 is used)
- #66074 ([mir-opt] Turn on the `ConstProp` pass by default)
- #66094 (Fix documentation for `Iterator::count()`.)
- #66166 (rename cfg(rustdoc) into cfg(doc))
- #66227 (docs: Fix link to BufWriter::flush)
- #66292 (add Result::map_or)
- #66297 (Add a callback that allows compiler consumers to override queries.)
- #66317 (Use a relative bindir for rustdoc to find rustc)
- #66330 (Improve non-exhaustiveness handling in usefulness checking)
- #66331 (Add some tests for fixed ICEs)
- #66334 (Move Session fields to CrateStore)
- #66335 (Move self-profile infrastructure to data structures)
- #66337 (Remove dead code for encoding/decoding lint IDs)
Failed merges:
r? @ghost
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 13, 2019
…c, r=QuietMisdreavus
rename cfg(rustdoc) into cfg(doc)
Needed by rust-lang#61351
r? @QuietMisdreavus
@JohnTitorJohnTitor mentioned this pull request Nov 13, 2019
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 13, 2019
…c, r=QuietMisdreavus
rename cfg(rustdoc) into cfg(doc)
Needed by rust-lang#61351
r? @QuietMisdreavus
@JohnTitorJohnTitor mentioned this pull request Nov 13, 2019
bors added a commit that referenced this pull request Nov 13, 2019
Rollup of 14 pull requests
Successful merges:
- #65932 (download .tar.xz if python3 is used)
- #66094 (Fix documentation for `Iterator::count()`.)
- #66166 (rename cfg(rustdoc) into cfg(doc))
- #66186 (Add long error explanation for E0623)
- #66227 (docs: Fix link to BufWriter::flush)
- #66248 (add raw ptr variant of UnsafeCell::get)
- #66292 (add Result::map_or)
- #66297 (Add a callback that allows compiler consumers to override queries.)
- #66317 (Use a relative bindir for rustdoc to find rustc)
- #66330 (Improve non-exhaustiveness handling in usefulness checking)
- #66331 (Add some tests for fixed ICEs)
- #66334 (Move Session fields to CrateStore)
- #66335 (Move self-profile infrastructure to data structures)
- #66337 (Remove dead code for encoding/decoding lint IDs)
Failed merges:
r? @ghost
@bors
bors merged commit 0282c27 into rust-lang:masterNov 13, 2019
@GuillaumeGomez
GuillaumeGomez deleted the rename-rustdoc-to-doc branch November 13, 2019 16:57
@QuietMisdreavusQuietMisdreavus mentioned this pull request Nov 13, 2019
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

@GuillaumeGomez@Dylan-DPC-zz@QuietMisdreavus@bors@JohnTitor