Skip to content

Commit 39b8a4d

Browse files
author
Andrew Hobden
committed
---
yaml --- r: 195901 b: refs/heads/beta c: 1a5e73a h: refs/heads/master i: 195899: 3420411 v: v3
1 parent 0060c7c commit 39b8a4d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2929
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3030
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3131
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
32-
refs/heads/beta: e489eaa0c5fb4a9d8b716dc3fc63aa653c22f4ec
32+
refs/heads/beta: 1a5e73a82d6a3e27804ac2f37d1f7dca62ecfc02
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3535
refs/heads/tmp: 9de34a84bb300bab1bf0227f577331620cd60511

branches/beta/src/libcore/error.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,23 @@
5252
//! use std::error::FromError;
5353
//! use std::{io, str};
5454
//! use std::fs::File;
55-
//!
55+
//!
5656
//! enum MyError { Io(io::Error), Utf8(str::Utf8Error), }
57-
//!
57+
//!
5858
//! impl FromError<io::Error> for MyError {
5959
//! fn from_error(err: io::Error) -> MyError { MyError::Io(err) }
6060
//! }
61-
//!
61+
//!
6262
//! impl FromError<str::Utf8Error> for MyError {
6363
//! fn from_error(err: str::Utf8Error) -> MyError { MyError::Utf8(err) }
6464
//! }
65-
//!
65+
//!
6666
//! #[allow(unused_variables)]
6767
//! fn open_and_map() -> Result<(), MyError> {
6868
//! let b = b"foo.txt";
6969
//! let s = try!(str::from_utf8(b));
7070
//! let f = try!(File::open(s));
71-
//!
71+
//!
7272
//! // do something interesting here...
7373
//! Ok(())
7474
//! }

0 commit comments

Comments
 (0)