diff options
| author | bors <bors@rust-lang.org> | 2019-03-31 17:21:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-31 17:21:14 +0000 |
| commit | 4fac5c98b22faa7fce2d5d64bf34c61340883302 (patch) | |
| tree | 9c75e0759b74f210c61fcc192fdd1b05d9784df9 /src/libstd | |
| parent | a89c03a30a1e8f1cd190114b765d01752d3ce8d8 (diff) | |
| parent | 34454451a19210341263ea32962d96f41faec2a5 (diff) | |
| download | rust-4fac5c98b22faa7fce2d5d64bf34c61340883302.tar.gz rust-4fac5c98b22faa7fce2d5d64bf34c61340883302.zip | |
Auto merge of #59590 - Centril:rollup, r=Centril
Rollup of 7 pull requests Successful merges: - #58805 (Lint for redundant imports) - #59506 (Use platform dependent mcount function) - #59519 (rustc_target: factor out common fields of non-Single Variants.) - #59580 (Allow closure to unsafe fn coercion) - #59581 (Stabilize refcell_replace_swap feature) - #59583 (match match match match match) - #59587 (Remove #[doc(hidden)] from Error::type_id) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/error.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 89051030f66..081fff0562b 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -197,7 +197,6 @@ pub trait Error: Debug + Display { fn source(&self) -> Option<&(dyn Error + 'static)> { None } /// Gets the `TypeId` of `self` - #[doc(hidden)] #[stable(feature = "error_type_id", since = "1.34.0")] fn type_id(&self) -> TypeId where Self: 'static { TypeId::of::<Self>() |