diff options
| author | bors <bors@rust-lang.org> | 2020-03-21 21:57:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-21 21:57:38 +0000 |
| commit | c6b172f7885cb83842fa15e4b0e2ff1647aebb40 (patch) | |
| tree | c9c762cf63210999b8cdc8630b98efa02bc8a6ee /src/libstd/error.rs | |
| parent | 38114ff16e7856f98b2b4be7ab4cd29b38bed59a (diff) | |
| parent | 17e6ed1fd97980146f63fb65e83da8702f294d31 (diff) | |
| download | rust-c6b172f7885cb83842fa15e4b0e2ff1647aebb40.tar.gz rust-c6b172f7885cb83842fa15e4b0e2ff1647aebb40.zip | |
Auto merge of #70246 - Dylan-DPC:rollup-vt9wex2, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - #70003 (symbol_names: treat ReifyShim like VtableShim.) - #70051 (Allow `hir().find` to return `None`) - #70126 (Fix ICE caused by truncating a negative ZST enum discriminant) - #70197 (For issue 53957: revise unit test to focus on underlying bug of 23076.) - #70215 (ast: Compress `AttrId` from `usize` to `u32`) - #70218 (Fix deprecated Error.description() usage in docs) - #70228 (Remove CARGO_BUILD_TARGET from bootstrap.py) - #70231 (Add explanation message for E0224) - #70232 (Tweak wording for std::io::Read::read function) - #70238 (Add a test for out-of-line module passed through a proc macro) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/error.rs')
| -rw-r--r-- | src/libstd/error.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 2a370f19296..b394f2efc2e 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -88,7 +88,7 @@ pub trait Error: Debug + Display { /// fn main() { /// match get_super_error() { /// Err(e) => { - /// println!("Error: {}", e.description()); + /// println!("Error: {}", e); /// println!("Caused by: {}", e.source().unwrap()); /// } /// _ => println!("No error"), |