diff options
| author | bors <bors@rust-lang.org> | 2020-01-08 19:46:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-08 19:46:58 +0000 |
| commit | caa231d998a5e853c7ba1455d7a05b500df9d63c (patch) | |
| tree | 16bcf8c8c892384fc5bff9f175d4e7a5aa5b6d13 /src/test/rustdoc-ui/coverage/json.rs | |
| parent | ed6468da160bd67a2ce0573427f09a98daff8c07 (diff) | |
| parent | 844530e31788e4898bed66cd121aa8e7ea737ded (diff) | |
| download | rust-caa231d998a5e853c7ba1455d7a05b500df9d63c.tar.gz rust-caa231d998a5e853c7ba1455d7a05b500df9d63c.zip | |
Auto merge of #68011 - JohnTitor:rollup-44s8twu, r=JohnTitor
Rollup of 10 pull requests
Successful merges:
- #67774 (Try statx for all linux-gnu target.)
- #67781 (Move `is_min_const_fn` query to librustc_mir.)
- #67798 (Remove wrong advice about spin locks from `spin_loop_hint` docs)
- #67849 (Add a check for swapped words when we can't find an identifier)
- #67875 (Distinguish between private items and hidden items in rustdoc)
- #67887 (`Option::{expect,unwrap}` and `Result::{expect, expect_err, unwrap, unwrap_err}` have `#[track_caller]`)
- #67955 (rustdoc: Remove more `#[doc(cfg(..))]` duplicates)
- #67977 (Updates for VxWorks)
- #67985 (Remove insignificant notes from CStr documentation)
- #68003 (ci: fix wrong shared.sh import for publish_toolstate)
Failed merges:
- #67820 (Parse the syntax described in RFC 2632)
- #67979 (Move `intravisit` => `rustc_hir` + misc cleanup)
r? @ghost
Diffstat (limited to 'src/test/rustdoc-ui/coverage/json.rs')
0 files changed, 0 insertions, 0 deletions