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.

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

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

Merged
merged 2 commits into from Sep 5, 2019

Conversation

@estebank
Copy link
Contributor

commented Aug 27, 2019

Fix #63821.

@Centril

This comment was marked as resolved.

Copy link
Member

commented Aug 27, 2019

A regression test would be nice =)

@estebank

This comment was marked as resolved.

Copy link
Contributor Author

commented Aug 27, 2019

@Centril I'm working on it :)

@Centril

This comment was marked as resolved.

Copy link
Member

commented Aug 27, 2019

@estebank Ah; fwiw, you can put [WIP] in the title :)

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

commented Aug 27, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-08-27T04:14:58.8198203Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-27T04:14:58.8379654Z ##[command]git config gc.auto 0
2019-08-27T04:14:58.8442599Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-27T04:14:58.8496211Z ##[command]git config --get-all http.proxy
2019-08-27T04:14:58.8644113Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/63930/merge:refs/remotes/pull/63930/merge
---
2019-08-27T04:15:32.8438226Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-27T04:15:32.8439521Z 
2019-08-27T04:15:32.8440330Z   git checkout -b <new-branch-name>
2019-08-27T04:15:32.8440952Z 
2019-08-27T04:15:32.8441481Z HEAD is now at f300a2f50 Merge 9f004b995372b17b4a9d0fef51017317664577fa into 0444b9f66acb5da23dc816e0d8eb59623ba9ea50
2019-08-27T04:15:32.8576237Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-27T04:15:32.8578520Z ==============================================================================
2019-08-27T04:15:32.8578580Z Task         : Bash
2019-08-27T04:15:32.8578614Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-27T04:21:18.8717840Z    Compiling serde_json v1.0.40
2019-08-27T04:21:20.3754517Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-08-27T04:21:29.9205205Z     Finished release [optimized] target(s) in 1m 18s
2019-08-27T04:21:29.9280459Z tidy check
2019-08-27T04:21:30.3781771Z tidy error: /checkout/src/test/rustdoc/through-proc-macro.rs: missing trailing newline
2019-08-27T04:21:31.6010515Z some tidy checks failed
2019-08-27T04:21:31.6010629Z 
2019-08-27T04:21:31.6010629Z 
2019-08-27T04:21:31.6012478Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-08-27T04:21:31.6012594Z 
2019-08-27T04:21:31.6012614Z 
2019-08-27T04:21:31.6021844Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-08-27T04:21:31.6021935Z Build completed unsuccessfully in 0:01:21
2019-08-27T04:21:31.6021935Z Build completed unsuccessfully in 0:01:21
2019-08-27T04:21:31.6067168Z == clock drift check ==
2019-08-27T04:21:31.6088372Z   local time: Tue Aug 27 04:21:31 UTC 2019
2019-08-27T04:21:31.7561973Z   network time: Tue, 27 Aug 2019 04:21:31 GMT
2019-08-27T04:21:31.7565252Z == end clock drift check ==
2019-08-27T04:21:33.0663113Z ##[error]Bash exited with code '1'.
2019-08-27T04:21:33.0691845Z ##[section]Starting: Checkout
2019-08-27T04:21:33.0693283Z ==============================================================================
2019-08-27T04:21:33.0693327Z Task         : Get sources
2019-08-27T04:21:33.0693381Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@estebank estebank force-pushed the estebank:rustdoc-ice branch from 9f004b9 to 7ed542d Aug 27, 2019

pub enum Boom {
/// [Oooops]
Bam,
}

This comment has been minimized.

Copy link
@estebank

estebank Aug 27, 2019

Author Contributor

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

This comment has been minimized.

Copy link
Contributor Author

commented Aug 28, 2019

@Centril

This comment has been minimized.

Copy link
Member

commented Aug 29, 2019

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

@nikomatsakis

This comment has been minimized.

Copy link
Contributor

commented Aug 29, 2019

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

@estebank

This comment has been minimized.

Copy link
Contributor Author

commented Sep 3, 2019

@GuillaumeGomez

This comment has been minimized.

Copy link
Member

commented Sep 3, 2019

Thanks!

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 3, 2019

📌 Commit 7ed542d has been approved by GuillaumeGomez

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

Fix rust-lang#63821.
bors added a commit that referenced this pull request Sep 4, 2019
Auto merge of #64137 - Centril:rollup-4am55q3, r=Centril
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
bors added a commit that referenced this pull request Sep 4, 2019
Auto merge of #64137 - Centril:rollup-4am55q3, r=Centril
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
Rollup merge of rust-lang#63930 - estebank:rustdoc-ice, r=GuillaumeGomez
Account for doc comments coming from proc macros without spans

Fix rust-lang#63821.
bors added a commit that referenced this pull request Sep 5, 2019
Auto merge of #64164 - Centril:rollup-vih960y, r=Centril
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)
 - #64023 (libstd fuchsia fixes)
 - #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)
 - #64052 (Rename test locals to work around LLDB bug)
 - #64063 (Fix const_err with `-(-0.0)`)
 - #64098 (Ensure edition lints and internal lints are enabled with deny-warnings=false)
 - #64100 (Fix const eval bug breaking run-pass tests in Miri)

Failed merges:

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

Fix rust-lang#63821.
bors added a commit that referenced this pull request Sep 5, 2019
Auto merge of #64168 - Centril:rollup-6kjtzmb, r=Centril
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)
 - #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)
 - #64098 (Ensure edition lints and internal lints are enabled with deny-warnings=false)
 - #64100 (Fix const eval bug breaking run-pass tests in Miri)
 - #64157 (Opaque type locations in error message for clarity.)

Failed merges:

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

Fix rust-lang#63821.
bors added a commit that referenced this pull request Sep 5, 2019
Auto merge of #64172 - Centril:rollup-8i8oh54, r=Centril
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

4 checks passed

pr Build #20190827.10 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
@cuviper cuviper referenced this pull request Sep 13, 2019
bors added a commit that referenced this pull request Sep 13, 2019
Auto merge of #64438 - cuviper:beta-rollup, r=Mark-Simulacrum
[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
bors added a commit that referenced this pull request Sep 14, 2019
Auto merge of #64438 - cuviper:beta-rollup, r=Mark-Simulacrum
[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 label Sep 14, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
9 participants
You can’t perform that action at this time.