Skip to content

Account for doc comments coming from proc macros without spans#63930

Merged
bors merged 2 commits intorust-lang:masterfrom
estebank:rustdoc-ice
Sep 5, 2019
Merged

Account for doc comments coming from proc macros without spans#63930
bors merged 2 commits intorust-lang:masterfrom
estebank:rustdoc-ice

Conversation

@estebank
Copy link
Copy Markdown
Contributor

@estebank estebank commented Aug 27, 2019

Fix #63821.

@Centril

This comment has been minimized.

Sign in to view
@estebank

This comment has been minimized.

Sign in to view
@Centril

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
estebank
estebank commented Aug 27, 2019
View reviewed changes
Comment thread src/test/rustdoc/through-proc-macro.rs
pub enum Boom {
/// [Oooops]
Bam,
}
Copy link
Copy Markdown
Contributor Author

@estebank estebank Aug 27, 2019

Choose a reason for hiding this comment

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

This test doesn't actually test that the warning is emitted, but it does make sure we don't regress back to the ICE.

@estebank
Copy link
Copy Markdown
Contributor Author

estebank commented Aug 28, 2019

r? @Centril

@estebank estebank added beta-nominated Nominated for backporting to the compiler in the beta channel. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Aug 28, 2019
@Centril
Copy link
Copy Markdown
Contributor

Centril commented Aug 29, 2019

I have never reviewed anything of importance in rustdoc.
r? @ollie27

@rust-highfive rust-highfive assigned ollie27 and unassigned Centril Aug 29, 2019
@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 29, 2019
@nikomatsakis
Copy link
Copy Markdown
Contributor

nikomatsakis commented Aug 29, 2019

Report from compiler triage meeting: Accepted for beta backport (once it lands)

@estebank
Copy link
Copy Markdown
Contributor Author

estebank commented Sep 3, 2019

Ping @rust-lang/rustdoc?

@GuillaumeGomez
Copy link
Copy Markdown
Member

GuillaumeGomez commented Sep 3, 2019

Thanks!

@bors: r+

@bors
Copy link
Copy Markdown
Collaborator

bors commented Sep 3, 2019

📌 Commit 7ed542d 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 Sep 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 4, 2019
@Centril
Rollup merge of rust-lang#63930 - estebank:rustdoc-ice, r=GuillaumeGomez
128baa4 
Account for doc comments coming from proc macros without spans

Fix rust-lang#63821.
@Centril Centril mentioned this pull request Sep 4, 2019
Closed
bors added a commit that referenced this pull request Sep 4, 2019
@bors
Auto merge of #64137 - Centril:rollup-4am55q3, r=Centril
4e99d1b 
Rollup of 10 pull requests

Successful merges:

 - #63166 (Add Result::cloned{,_err} and Result::copied{,_err})
 - #63930 (Account for doc comments coming from proc macros without spans)
 - #63985 (Stabilize pin_into_inner in 1.39.0)
 - #64023 (libstd fuchsia fixes)
 - #64030 (Fix unlock ordering in SGX synchronization primitives)
 - #64041 (use TokenStream rather than &[TokenTree] for built-in macros)
 - #64043 (Add some more tests for underscore imports)
 - #64092 (Update xLTO compatibility table in rustc book.)
 - #64120 (Move path parsing earlier)
 - #64123 (Added warning around code with reference to uninit bytes)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 5, 2019
@Centril
Rollup merge of rust-lang#63930 - estebank:rustdoc-ice, r=GuillaumeGomez
58b84bf 
Account for doc comments coming from proc macros without spans

Fix rust-lang#63821.
@Centril Centril mentioned this pull request Sep 5, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Sep 5, 2019
@Centril
Rollup merge of rust-lang#63930 - estebank:rustdoc-ice, r=GuillaumeGomez
bdcc539 
Account for doc comments coming from proc macros without spans

Fix rust-lang#63821.
@Centril Centril mentioned this pull request Sep 5, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Sep 5, 2019
@Centril
Rollup merge of rust-lang#63930 - estebank:rustdoc-ice, r=GuillaumeGomez
d855bde 
Account for doc comments coming from proc macros without spans

Fix rust-lang#63821.
@Centril Centril mentioned this pull request Sep 5, 2019
Merged
bors added a commit that referenced this pull request Sep 5, 2019
@bors
Auto merge of #64172 - Centril:rollup-8i8oh54, r=Centril
6187684 
Rollup of 11 pull requests

Successful merges:

 - #62848 (Use unicode-xid crate instead of libcore)
 - #63774 (Fix `window.hashchange is not a function`)
 - #63930 (Account for doc comments coming from proc macros without spans)
 - #64003 (place: Passing `align` = `layout.align.abi`, when also passing `layout`)
 - #64030 (Fix unlock ordering in SGX synchronization primitives)
 - #64041 (use TokenStream rather than &[TokenTree] for built-in macros)
 - #64051 (Add x86_64-linux-kernel target)
 - #64063 (Fix const_err with `-(-0.0)`)
 - #64083 (Point at appropriate arm on type error on if/else/match with one non-! arm)
 - #64100 (Fix const eval bug breaking run-pass tests in Miri)
 - #64157 (Opaque type locations in error message for clarity.)

Failed merges:

r? @ghost
@bors bors merged commit 7ed542d into rust-lang:master Sep 5, 2019
@cuviper cuviper mentioned this pull request Sep 13, 2019
Merged
bors added a commit that referenced this pull request Sep 14, 2019
@bors
Auto merge of #64438 - cuviper:beta-rollup, r=Mark-Simulacrum
fdd4856 
[beta] Rollup backports

Cherry-picked:

- Permit unwinding through FFI by default #62603
- pprust: Do not print spaces before some tokens #63897
- Account for doc comments coming from proc macros without spans #63930
- Support "soft" feature-gating using a lint #64066
- Update xLTO compatibility table in rustc book. #64092
- Include compiler-rt in the source tarball #64240
- Update LLVM submodule #64317

r? @Mark-Simulacrum
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 14, 2019
@estebank estebank deleted the rustdoc-ice branch November 9, 2023 05:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@ollie27 ollie27

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

rustdoc crashes on nightly nightly-2019-08-22

9 participants

@estebank @Centril @rust-highfive @nikomatsakis @GuillaumeGomez @bors @cuviper @QuietMisdreavus @ollie27