diff options
| author | bors <bors@rust-lang.org> | 2020-03-21 13:26:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-21 13:26:44 +0000 |
| commit | 7900b2bc135a0e02d945143176cf3a80b6e92aa8 (patch) | |
| tree | 42bf64842fa16d1666f68b4743abb0a7c18b9049 /src/test/rustdoc-ui/coverage/json.rs | |
| parent | 98803c182b2ba6ef5dccb6bf501958249295eac0 (diff) | |
| parent | f1ab7500838eee0736055eb2b65ff37fd05fcbd0 (diff) | |
| download | rust-7900b2bc135a0e02d945143176cf3a80b6e92aa8.tar.gz rust-7900b2bc135a0e02d945143176cf3a80b6e92aa8.zip | |
Auto merge of #70222 - Dylan-DPC:rollup-cwkv5ez, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #69497 (Don't unwind when hitting the macro expansion recursion limit) - #69901 (add #[rustc_layout(debug)]) - #69910 (Avoid query type in generics) - #69955 (Fix abort-on-eprintln during process shutdown) - #70032 (put type params in front of const params in generics_of) - #70119 (rustc: use LocalDefId instead of DefId in TypeckTables.) Failed merges: r? @ghost
Diffstat (limited to 'src/test/rustdoc-ui/coverage/json.rs')
0 files changed, 0 insertions, 0 deletions