about summary refs log tree commit diff
path: root/src/test/rustdoc-ui/coverage/json.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-15 10:52:37 +0000
committerbors <bors@rust-lang.org>2020-03-15 10:52:37 +0000
commit5a72ecf2c5c97933cecce91cb58d104da8120624 (patch)
tree5d63fe83cbdf0ea858d2ef9942a384e5d7089cfd /src/test/rustdoc-ui/coverage/json.rs
parent7cdbc87a49b0b705a41a004a6d486b0952521ae7 (diff)
parent838884e022ff571108d166f4637281eafabad3e1 (diff)
downloadrust-5a72ecf2c5c97933cecce91cb58d104da8120624.tar.gz
rust-5a72ecf2c5c97933cecce91cb58d104da8120624.zip
Auto merge of #70016 - Dylan-DPC:rollup-5k7lxs3, r=Dylan-DPC
Rollup of 7 pull requests

Successful merges:

 - #69357 (Emit 1-based column numbers in debuginfo)
 - #69471 (Remove `sip::Hasher::short_write`.)
 - #69498 (Change "method" to "associated function")
 - #69967 (Remove a few `Rc`s from RegionInferenceCtxt)
 - #69987 (Add self to .mailmap)
 - #69991 (fix E0117 message out of sync)
 - #69993 (Add long error explanation for E0693)

Failed merges:

r? @ghost
Diffstat (limited to 'src/test/rustdoc-ui/coverage/json.rs')
0 files changed, 0 insertions, 0 deletions