From 04de8f852c4def51f02eb812f4ecee83d416911b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20L=C3=B6bel?= Date: Thu, 9 May 2013 13:52:07 +0200 Subject: [PATCH] Fix cosmetics for fail!() calls --- src/libcore/local_data.rs | 4 ++-- src/libcore/num/strconv.rs | 16 +++++++--------- src/libcore/os.rs | 6 ++---- src/libcore/run.rs | 3 +-- src/libcore/str.rs | 2 +- src/librustc/driver/driver.rs | 6 ++---- src/librustc/metadata/tydecode.rs | 8 ++++---- src/librustc/middle/kind.rs | 8 ++++---- src/librustc/middle/typeck/infer/test.rs | 8 ++++---- src/librustdoc/attr_pass.rs | 5 ++--- src/librustpkg/rustpkg.rc | 3 +-- src/librustpkg/workspace.rs | 7 +++---- src/libstd/ebml.rs | 11 ++++------- src/libstd/net_tcp.rs | 4 ++-- src/libstd/sync.rs | 6 ++---- src/libsyntax/codemap.rs | 3 +-- src/libsyntax/ext/expand.rs | 2 +- src/libsyntax/print/pprust.rs | 2 +- src/test/run-fail/assert-eq-macro-fail.rs | 2 +- src/test/run-fail/while-fail.rs | 2 +- .../run-pass/nullable-pointer-iotareduction.rs | 2 +- 21 files changed, 47 insertions(+), 63 deletions(-) diff --git a/src/libcore/local_data.rs b/src/libcore/local_data.rs index a440a7f6410..2cbf8b9f05e 100644 --- a/src/libcore/local_data.rs +++ b/src/libcore/local_data.rs @@ -133,13 +133,13 @@ fn my_key(_x: @~str) { } local_data_modify(my_key, |data| { match data { Some(@ref val) => fail!("unwelcome value: %s", *val), - None => Some(@~"first data") + None => Some(@~"first data") } }); local_data_modify(my_key, |data| { match data { Some(@~"first data") => Some(@~"next data"), - Some(@ref val) => fail!("wrong value: %s", *val), + Some(@ref val) => fail!("wrong value: %s", *val), None => fail!("missing value") } }); diff --git a/src/libcore/num/strconv.rs b/src/libcore/num/strconv.rs index 044b0d4a36c..1d65b84b7ce 100644 --- a/src/libcore/num/strconv.rs +++ b/src/libcore/num/strconv.rs @@ -178,11 +178,9 @@ pub fn to_str_bytes_common (~[u8], bool) { if (radix as int) < 2 { - fail!("to_str_bytes_common: radix %? to low, \ - must lie in the range [2, 36]", radix); + fail!("to_str_bytes_common: radix %? to low, must lie in the range [2, 36]", radix); } else if radix as int > 36 { - fail!("to_str_bytes_common: radix %? to high, \ - must lie in the range [2, 36]", radix); + fail!("to_str_bytes_common: radix %? to high, must lie in the range [2, 36]", radix); } let _0: T = Zero::zero(); @@ -445,19 +443,19 @@ pub fn from_str_bytes_common+ match exponent { ExpDec if radix >= DIGIT_E_RADIX // decimal exponent 'e' => fail!("from_str_bytes_common: radix %? incompatible with \ - use of 'e' as decimal exponent", radix), + use of 'e' as decimal exponent", radix), ExpBin if radix >= DIGIT_P_RADIX // binary exponent 'p' => fail!("from_str_bytes_common: radix %? incompatible with \ - use of 'p' as binary exponent", radix), + use of 'p' as binary exponent", radix), _ if special && radix >= DIGIT_I_RADIX // first digit of 'inf' => fail!("from_str_bytes_common: radix %? incompatible with \ - special values 'inf' and 'NaN'", radix), + special values 'inf' and 'NaN'", radix), _ if (radix as int) < 2 => fail!("from_str_bytes_common: radix %? to low, \ - must lie in the range [2, 36]", radix), + must lie in the range [2, 36]", radix), _ if (radix as int) > 36 => fail!("from_str_bytes_common: radix %? to high, \ - must lie in the range [2, 36]", radix), + must lie in the range [2, 36]", radix), _ => () } diff --git a/src/libcore/os.rs b/src/libcore/os.rs index c512372d7c6..9129b33fff5 100644 --- a/src/libcore/os.rs +++ b/src/libcore/os.rs @@ -178,8 +178,7 @@ unsafe fn get_env_pairs() -> ~[~str] { }; let ch = GetEnvironmentStringsA(); if (ch as uint == 0) { - fail!("os::env() failure getting env string from OS: %s", - os::last_os_error()); + fail!("os::env() failure getting env string from OS: %s", os::last_os_error()); } let mut curr_ptr: uint = ch as uint; let mut result = ~[]; @@ -201,8 +200,7 @@ unsafe fn get_env_pairs() -> ~[~str] { } let environ = rust_env_pairs(); if (environ as uint == 0) { - fail!("os::env() failure getting env string from OS: %s", - os::last_os_error()); + fail!("os::env() failure getting env string from OS: %s", os::last_os_error()); } let mut result = ~[]; ptr::array_each(environ, |e| { diff --git a/src/libcore/run.rs b/src/libcore/run.rs index c0c1698ebc0..c84e920a172 100644 --- a/src/libcore/run.rs +++ b/src/libcore/run.rs @@ -646,8 +646,7 @@ pub fn program_output(prog: &str, args: &[~str]) -> ProgramOutput { errs = s; } (n, _) => { - fail!("program_output received an unexpected file \ - number: %u", n); + fail!("program_output received an unexpected file number: %u", n); } }; count -= 1; diff --git a/src/libcore/str.rs b/src/libcore/str.rs index ce6b7e495ee..ce9db796b67 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -1052,7 +1052,7 @@ enum LengthLimit { (B, Cr, UnderLim) => { B } (B, Cr, OverLim) if (i - last_start + 1) > lim => fail!("word starting with %? longer than limit!", - self::slice(ss, last_start, i + 1)), + self::slice(ss, last_start, i + 1)), (B, Cr, OverLim) => { slice(); slice_start = last_start; B } (B, Ws, UnderLim) => { last_end = i; C } (B, Ws, OverLim) => { last_end = i; slice(); A } diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index f8d6eb0d442..b11aec5b841 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -917,8 +917,7 @@ fn test_switch_implies_cfg_test() { let matches = &match getopts(~[~"--test"], optgroups()) { Ok(copy m) => m, - Err(copy f) => fail!("test_switch_implies_cfg_test: %s", - getopts::fail_str(f)) + Err(copy f) => fail!("test_switch_implies_cfg_test: %s", getopts::fail_str(f)) }; let sessopts = build_session_options( @~"rustc", matches, diagnostic::emit); @@ -935,8 +934,7 @@ fn test_switch_implies_cfg_test_unless_cfg_test() { &match getopts(~[~"--test", ~"--cfg=test"], optgroups()) { Ok(copy m) => m, Err(copy f) => { - fail!("test_switch_implies_cfg_test_unless_cfg_test: %s", - getopts::fail_str(f)); + fail!("test_switch_implies_cfg_test_unless_cfg_test: %s", getopts::fail_str(f)); } }; let sessopts = build_session_options( diff --git a/src/librustc/metadata/tydecode.rs b/src/librustc/metadata/tydecode.rs index 3bedffc465d..cc9a18ea3a3 100644 --- a/src/librustc/metadata/tydecode.rs +++ b/src/librustc/metadata/tydecode.rs @@ -531,13 +531,13 @@ pub fn parse_def_id(buf: &[u8]) -> ast::def_id { let crate_num = match uint::parse_bytes(crate_part, 10u) { Some(cn) => cn as int, - None => fail!("internal error: parse_def_id: crate number \ - expected, but found %?", crate_part) + None => fail!("internal error: parse_def_id: crate number expected, but found %?", + crate_part) }; let def_num = match uint::parse_bytes(def_part, 10u) { Some(dn) => dn as int, - None => fail!("internal error: parse_def_id: id expected, but \ - found %?", def_part) + None => fail!("internal error: parse_def_id: id expected, but found %?", + def_part) }; ast::def_id { crate: crate_num, node: def_num } } diff --git a/src/librustc/middle/kind.rs b/src/librustc/middle/kind.rs index 26bab63f4f2..b220379e330 100644 --- a/src/librustc/middle/kind.rs +++ b/src/librustc/middle/kind.rs @@ -276,10 +276,10 @@ pub fn check_expr(e: @expr, cx: Context, v: visit::vt) { if ts.len() != type_param_defs.len() { // Fail earlier to make debugging easier fail!("internal error: in kind::check_expr, length \ - mismatch between actual and declared bounds: actual = \ - %s, declared = %s", - ts.repr(cx.tcx), - type_param_defs.repr(cx.tcx)); + mismatch between actual and declared bounds: actual = \ + %s, declared = %s", + ts.repr(cx.tcx), + type_param_defs.repr(cx.tcx)); } for vec::each2(**ts, *type_param_defs) |&ty, type_param_def| { check_bounds(cx, type_parameter_id, e.span, ty, type_param_def) diff --git a/src/librustc/middle/typeck/infer/test.rs b/src/librustc/middle/typeck/infer/test.rs index ab7f9f20066..1d24a4dbd4f 100644 --- a/src/librustc/middle/typeck/infer/test.rs +++ b/src/librustc/middle/typeck/infer/test.rs @@ -154,16 +154,16 @@ fn is_subtype(&self, a: ty::t, b: ty::t) -> bool { fn assert_subtype(&self, a: ty::t, b: ty::t) { if !self.is_subtype(a, b) { fail!("%s is not a subtype of %s, but it should be", - self.ty_to_str(a), - self.ty_to_str(b)); + self.ty_to_str(a), + self.ty_to_str(b)); } } fn assert_not_subtype(&self, a: ty::t, b: ty::t) { if self.is_subtype(a, b) { fail!("%s is a subtype of %s, but it shouldn't be", - self.ty_to_str(a), - self.ty_to_str(b)); + self.ty_to_str(a), + self.ty_to_str(b)); } } diff --git a/src/librustdoc/attr_pass.rs b/src/librustdoc/attr_pass.rs index eea4f6c1438..5ce3c136567 100644 --- a/src/librustdoc/attr_pass.rs +++ b/src/librustdoc/attr_pass.rs @@ -140,9 +140,8 @@ fn fold_enum( copy ast_variant.node.attrs) } _ => { - fail!("Enum variant %s has id that's \ - not bound to an enum item", - variant.name) + fail!("Enum variant %s has id that's not bound to an enum item", + variant.name) } } } diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc index 5c4dbce1b4a..30a84f56b5c 100644 --- a/src/librustpkg/rustpkg.rc +++ b/src/librustpkg/rustpkg.rc @@ -146,8 +146,7 @@ impl PkgScript { } } Err(e) => { - fail!("Running package script, couldn't find rustpkg sysroot (%s)", - e) + fail!("Running package script, couldn't find rustpkg sysroot (%s)", e) } } } diff --git a/src/librustpkg/workspace.rs b/src/librustpkg/workspace.rs index cf6707eed29..b0c6df05038 100644 --- a/src/librustpkg/workspace.rs +++ b/src/librustpkg/workspace.rs @@ -21,10 +21,9 @@ pub fn pkg_parent_workspaces(pkgid: PkgId, action: &fn(&Path) -> bool) -> bool { workspace_contains_package_id(pkgid, ws)); if workspaces.is_empty() { // tjc: make this a condition - fail!("Package %s not found in any of \ - the following workspaces: %s", - pkgid.path.to_str(), - rust_path().to_str()); + fail!("Package %s not found in any of the following workspaces: %s", + pkgid.path.to_str(), + rust_path().to_str()); } for workspaces.each |ws| { if action(ws) { 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 @@ fn _check_label(&mut self, lbl: &str) { 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 @@ fn next_doc(&mut self, exp_tag: EbmlEncoderTag) -> Doc { 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 @@ pub fn impl_gl_tcp_ipv4_server_address_in_use() { 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 @@ pub fn impl_gl_tcp_ipv4_server_access_denied() { 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(out_of_bounds: Option, 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() } } diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index 837ce58af1a..e0392b476e4 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -430,8 +430,7 @@ fn lookup_filemap_idx(&self, pos: BytePos) -> uint { } } if (a >= len) { - fail!("position %u does not resolve to a source location", - pos.to_uint()) + fail!("position %u does not resolve to a source location", pos.to_uint()) } return a; diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 914fc74c3d1..55229edfa18 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -468,7 +468,7 @@ pub fn core_macros() -> ~str { let expected_val = $expected; // check both directions of equality.... if !((given_val == expected_val) && (expected_val == given_val)) { - fail!(\"left: %? != right: %?\", given_val, expected_val); + fail!(\"left: %? does not equal right: %?\", given_val, expected_val); } } ) diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 65e4cdb53ab..599024a781f 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -2237,7 +2237,7 @@ mod test { fn string_check (given : &T, expected: &T) { if !(given == expected) { - fail!("given %?, expected %?",given,expected); + fail!("given %?, expected %?", given, expected); } } diff --git a/src/test/run-fail/assert-eq-macro-fail.rs b/src/test/run-fail/assert-eq-macro-fail.rs index 7d98d0dccde..facfb89409c 100644 --- a/src/test/run-fail/assert-eq-macro-fail.rs +++ b/src/test/run-fail/assert-eq-macro-fail.rs @@ -1,4 +1,4 @@ -// error-pattern:left: 14 != right: 15 +// error-pattern:left: 14 does not equal right: 15 #[deriving(Eq)] struct Point { x : int } diff --git a/src/test/run-fail/while-fail.rs b/src/test/run-fail/while-fail.rs index 8f409d93536..db04026ed97 100644 --- a/src/test/run-fail/while-fail.rs +++ b/src/test/run-fail/while-fail.rs @@ -10,5 +10,5 @@ // error-pattern:giraffe fn main() { - fail!({ while true { fail!(~"giraffe")}; "clandestine" }); + fail!({ while true { fail!("giraffe") }; "clandestine" }); } diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/run-pass/nullable-pointer-iotareduction.rs index 5aca37568a2..6ec20549963 100644 --- a/src/test/run-pass/nullable-pointer-iotareduction.rs +++ b/src/test/run-pass/nullable-pointer-iotareduction.rs @@ -58,7 +58,7 @@ fn get_ref<'r>(&'r self) -> (int, &'r T) { match t_.get_ref() { (23, $v) => { $chk } _ => fail!("Thing::<%s>(23, %s).get_ref() != (23, _)", - stringify!($T), stringify!($e)) + stringify!($T), stringify!($e)) } }} } -- GitLab