languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-07-20 06:54:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

auto merge of #5609 : Kimundi/rust/incoming, r=catamorphism

Browse source
This commit is contained in:
bors 2013-03-28 14:42:49 -07:00
parent e16f94f6a1 eac2f3b93e
commit 5a97c484b1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libcore/str.rs
View file

@ -726,7 +726,8 @@ enum LengthLimit {
(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 }

3
src/librustc/driver/driver.rs
View file

@ -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"),