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

move Attribute::with_desugared_doc to librustdoc #65789

Merged
merged 2 commits into from
Oct 25, 2019
Merged

move Attribute::with_desugared_doc to librustdoc #65789

merged 2 commits into from
Oct 25, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 25, 2019

From #65324.

r? @varkor

@Centril
Copy link
Contributor Author

Centril commented Oct 25, 2019

r? @davidtwco :)

@rust-highfive rust-highfive assigned davidtwco and unassigned varkor Oct 25, 2019
davidtwco
davidtwco requested changes Oct 25, 2019
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

Mostly looks good, one or two comments need updated and a couple clarifications.

src/librustdoc/clean/mod.rs Outdated Show resolved Hide resolved
src/librustdoc/clean/mod.rs Outdated Show resolved Hide resolved
src/libsyntax/parse/lexer/comments.rs Show resolved Hide resolved
src/libsyntax/parse/lexer/tokentrees.rs Show resolved Hide resolved
@Centril
with_desugared_doc: correctly refer to attr instead of self
9e3e3a4 
Co-Authored-By: David Wood <Q0KPU0H1YOEPHRY1R2SN5B5RL@david.davidtw.co>
davidtwco
davidtwco approved these changes Oct 25, 2019
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

r=me when CI is green.

@Centril
Copy link
Contributor Author

Centril commented Oct 25, 2019

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Oct 25, 2019

📌 Commit 9e3e3a4 has been approved by davidtwco

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 25, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 25, 2019
@Centril
Rollup merge of rust-lang#65789 - Centril:with-desugared-doc, r=david…
cbcbba2 
…twco

move Attribute::with_desugared_doc to librustdoc

From rust-lang#65324.

r? @varkor
@Centril Centril mentioned this pull request Oct 25, 2019
Merged
bors added a commit that referenced this pull request Oct 25, 2019
@bors
Auto merge of #65804 - Centril:rollup-arlxgch, r=Centril
23f890f 
Rollup of 9 pull requests

Successful merges:

 - #64639 (Stabilize `#[non_exhaustive]` (RFC 2008))
 - #65074 (Fix the start/end byte positions in the compiler JSON output)
 - #65315 (Intern place projection)
 - #65685 (Fix check of `statx` and handle EPERM)
 - #65731 (Prevent unnecessary allocation in PathBuf::set_extension.)
 - #65740 (Fix default "disable-shortcuts" feature value)
 - #65787 (move panictry! to where it is used.)
 - #65789 (move Attribute::with_desugared_doc to librustdoc)
 - #65790 (move report_invalid_macro_expansion_item to item.rs)

Failed merges:

r? @ghost
@bors bors merged commit 9e3e3a4 into rust-lang:master Oct 25, 2019
@Centril Centril deleted the with-desugared-doc branch October 25, 2019 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

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
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Centril @bors @davidtwco @varkor