diff options
| author | Marvin Löbel <loebel.marvin@gmail.com> | 2013-05-09 13:52:07 +0200 |
|---|---|---|
| committer | Björn Steinbrink <bsteinbr@gmail.com> | 2013-05-14 16:36:24 +0200 |
| commit | 04de8f852c4def51f02eb812f4ecee83d416911b (patch) | |
| tree | bf394aa7ebda0ae70ae70d03f753d6de4388e939 /src/libstd | |
| parent | bdc182cc41c2741edc6fdc4ec09b8522479aab40 (diff) | |
| download | rust-04de8f852c4def51f02eb812f4ecee83d416911b.tar.gz rust-04de8f852c4def51f02eb812f4ecee83d416911b.zip | |
Fix cosmetics for fail!() calls
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/ebml.rs | 11 | ||||
| -rw-r--r-- | src/libstd/net_tcp.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sync.rs | 6 |
3 files changed, 8 insertions, 13 deletions
diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs index 842a434ada4..062ad403dd6 100644 --- a/src/libstd/ebml.rs +++ b/src/libstd/ebml.rs @@ -319,9 +319,7 @@ pub mod reader { self.pos = r_doc.end; let str = doc_as_str(r_doc); if lbl != str { - fail!("Expected label %s but found %s", - lbl, - str); + fail!("Expected label %s but found %s", lbl, str); } } } @@ -338,12 +336,11 @@ pub mod reader { copy self.parent.start, copy self.parent.end, copy self.pos, r_tag, r_doc.start, r_doc.end); if r_tag != (exp_tag as uint) { - fail!("expected EBML doc with tag %? but found tag %?", - exp_tag, r_tag); + fail!("expected EBML doc with tag %? but found tag %?", exp_tag, r_tag); } if r_doc.end > self.parent.end { - fail!("invalid EBML, child extends to 0x%x, \ - parent to 0x%x", r_doc.end, self.parent.end); + fail!("invalid EBML, child extends to 0x%x, parent to 0x%x", + r_doc.end, self.parent.end); } self.pos = r_doc.end; r_doc diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs index 8cf2a44b0a6..9387903d842 100644 --- a/src/libstd/net_tcp.rs +++ b/src/libstd/net_tcp.rs @@ -1687,7 +1687,7 @@ mod test { assert!(true); } _ => { - fail!("expected address_in_use listen error,\ + fail!("expected address_in_use listen error, \ but got a different error varient. check logs."); } } @@ -1706,7 +1706,7 @@ mod test { assert!(true); } _ => { - fail!("expected address_in_use listen error,\ + fail!("expected address_in_use listen error, \ but got a different error varient. check logs."); } } diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs index 023fc18cdc1..59c6a804408 100644 --- a/src/libstd/sync.rs +++ b/src/libstd/sync.rs @@ -329,11 +329,9 @@ fn check_cvar_bounds<U>(out_of_bounds: Option<uint>, id: uint, act: &str, blk: &fn() -> U) -> U { match out_of_bounds { Some(0) => - fail!("%s with illegal ID %u - this lock has no condvars!", - act, id), + fail!("%s with illegal ID %u - this lock has no condvars!", act, id), Some(length) => - fail!("%s with illegal ID %u - ID must be less than %u", - act, id, length), + fail!("%s with illegal ID %u - ID must be less than %u", act, id, length), None => blk() } } |