diff options
| author | bors <bors@rust-lang.org> | 2013-03-28 14:42:49 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-28 14:42:49 -0700 |
| commit | 5a97c484b1b5af479e34b7d5c454c7c97d9b31fb (patch) | |
| tree | f8880adb52de06035a44478e486ba42cd0677aee | |
| parent | e16f94f6a184d2426841a23847edfd0cc6b83aa7 (diff) | |
| parent | eac2f3b93e1458488e0aefcdfa02a4e524e8736d (diff) | |
| download | rust-5a97c484b1b5af479e34b7d5c454c7c97d9b31fb.tar.gz rust-5a97c484b1b5af479e34b7d5c454c7c97d9b31fb.zip | |
auto merge of #5609 : Kimundi/rust/incoming, r=catamorphism
| -rw-r--r-- | src/libcore/str.rs | 3 | ||||
| -rw-r--r-- | src/librustc/driver/driver.rs | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/str.rs b/src/libcore/str.rs index a6f9ae84f44..96d85a1f7fe 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -726,7 +726,8 @@ pub fn each_split_within<'a>(ss: &'a str, (B, Cr, UnderLim) => { B } (B, Cr, OverLim) if (i - last_start + 1) > lim - => { fail!(~"word longer than limit!") } + => fail!(fmt!("word starting with %? longer than limit!", + 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 1de69ed85a8..097aad72f4e 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -762,8 +762,7 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] { optflag(~"", ~"test", ~"Build a test harness"), optopt(~"", ~"target", ~"Target triple cpu-manufacturer-kernel[-os] - to compile for (see - http://sources.redhat.com/autobook/autobook/autobook_17.html + to compile for (see chapter 3.4 of http://www.sourceware.org/autobook/ for detail)", ~"TRIPLE"), optopt(~"", ~"android-cross-path", ~"The path to the Android NDK", "PATH"), |