diff options
| author | bors <bors@rust-lang.org> | 2020-05-29 07:52:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-29 07:52:06 +0000 |
| commit | 77f95a89a108d4cd6ad1230fb210b3640952b146 (patch) | |
| tree | 52be6fd4f91f284178f2d81208b27cd6780602d7 /src/libstd/error.rs | |
| parent | 9cd3f1c54956e5b306567161d1965277c9ef8455 (diff) | |
| parent | fb506af138c40ebc3a62ada931259d60a74a6266 (diff) | |
| download | rust-77f95a89a108d4cd6ad1230fb210b3640952b146.tar.gz rust-77f95a89a108d4cd6ad1230fb210b3640952b146.zip | |
Auto merge of #72727 - JohnTitor:rollup-nni16m2, r=JohnTitor
Rollup of 11 pull requests Successful merges: - #71633 (Impl Error for Infallible) - #71843 (Tweak and stabilize AtomicN::fetch_update) - #72288 (Stabilization of weak-into-raw) - #72324 (Stabilize AtomicN::fetch_min and AtomicN::fetch_max) - #72452 (Clarified the documentation for Formatter::precision) - #72495 (Improve E0601 explanation) - #72534 (Improve missing `@` in slice binding pattern diagnostics) - #72547 (Added a codegen test for a recent optimization for overflow-checks=on) - #72711 (remove redundant `mk_const`) - #72713 (Whitelist #[allow_internal_unstable]) - #72720 (Clarify the documentation of `take`) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/error.rs')
| -rw-r--r-- | src/libstd/error.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 24b57f12e8d..3b4cb859dd4 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -14,6 +14,7 @@ // reconsider what crate these items belong in. use core::array; +use core::convert::Infallible; use crate::alloc::{AllocErr, LayoutErr}; use crate::any::TypeId; @@ -474,7 +475,7 @@ impl Error for string::FromUtf16Error { } #[stable(feature = "str_parse_error2", since = "1.8.0")] -impl Error for string::ParseError { +impl Error for Infallible { fn description(&self) -> &str { match *self {} } |
