diff options
| author | bors <bors@rust-lang.org> | 2015-01-29 16:28:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-29 16:28:52 +0000 |
| commit | 265a23320dbeaeca45b889cfea684d71dec1b8e6 (patch) | |
| tree | 36775481b19e207f139d108aeb88875b695de181 /src/rustbook | |
| parent | 3d6f5100aff24aa97275dc92ade728caac605560 (diff) | |
| parent | a6f9180fd61f509ebc6d666eda3f6bb42dd02573 (diff) | |
| download | rust-265a23320dbeaeca45b889cfea684d71dec1b8e6.tar.gz rust-265a23320dbeaeca45b889cfea684d71dec1b8e6.zip | |
Auto merge of #21677 - japaric:no-range, r=alexcrichton
Note: Do not merge until we get a newer snapshot that includes #21374 There was some type inference fallout (see 4th commit) because type inference with `a..b` is not as good as with `range(a, b)` (see #21672). r? @alexcrichton
Diffstat (limited to 'src/rustbook')
| -rw-r--r-- | src/rustbook/error.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rustbook/error.rs b/src/rustbook/error.rs index d4829a2c391..1c10a270acc 100644 --- a/src/rustbook/error.rs +++ b/src/rustbook/error.rs @@ -11,7 +11,7 @@ //! Error handling utilities. WIP. use std::fmt; -use std::fmt::{Show, Formatter}; +use std::fmt::{Debug, Formatter}; use std::old_io::IoError; @@ -32,7 +32,7 @@ pub trait FromError<E> { fn from_err(err: E) -> Self; } -impl Show for Box<Error + 'static> { +impl Debug for Box<Error + 'static> { fn fmt(&self, f: &mut Formatter) -> fmt::Result { write!(f, "{}", self.description()) } |
