diff options
| author | bors <bors@rust-lang.org> | 2020-12-04 04:51:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-12-04 04:51:49 +0000 |
| commit | e9dd18ca749801a19d85bfb424ae12011a8ff894 (patch) | |
| tree | ff6d9acd47c92008a14624ee9a038130fe7d1760 /library/core/src/panic.rs | |
| parent | 6513f5029183471993bab4b05ae5f5433f461b08 (diff) | |
| parent | 5cebbaa6a1509ca17cef41ef61df624dad9740c2 (diff) | |
Auto merge of #79686 - Dylan-DPC:rollup-leama5f, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - #77686 (Render Markdown in search results) - #79541 (Doc keyword lint pass) - #79602 (Fix SGX CI) - #79611 (Use more std:: instead of core:: in docs for consistency) - #79623 (Pass around Symbols instead of Idents in doctree) - #79627 (Update cargo) - #79631 (disable a ptr equality test on Miri) - #79638 (Use `item_name` instead of pretty printing for resolving `Self` on intra-doc links) - #79646 (rustc_metadata: Remove some dead code) - #79664 (move interpret::MemoryKind::Heap to const eval) - #79678 (Fix some clippy lints) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/core/src/panic.rs')
| -rw-r--r-- | library/core/src/panic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/core/src/panic.rs b/library/core/src/panic.rs index 34a974b8271..03bb849509a 100644 --- a/library/core/src/panic.rs +++ b/library/core/src/panic.rs @@ -189,7 +189,7 @@ impl<'a> Location<'a> { /// # Examples /// /// ``` - /// use core::panic::Location; + /// use std::panic::Location; /// /// /// Returns the [`Location`] at which it is called. /// #[track_caller] |