Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 221fc1e

Browse files
committedOct 31, 2014
auto merge of #18459 : alexcrichton/rust/rollup, r=alexcrichton
2 parents a12d06b + 6fcba88 commit 221fc1e

File tree

257 files changed

+1170
-1439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+1170
-1439
lines changed
 

‎src/compiletest/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
10131013
if prefix_matches(line, prefixes[i].as_slice()) &&
10141014
line.contains(ee.kind.as_slice()) &&
10151015
line.contains(ee.msg.as_slice()) {
1016-
*found_flags.get_mut(i) = true;
1016+
found_flags[i] = true;
10171017
was_expected = true;
10181018
break;
10191019
}

‎src/doc/complement-bugreport.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ release: 0.12.0
4747
```
4848

4949
Finally, if you can run the offending command under gdb, pasting a stack trace can be
50-
useful; to do so, you will need to set a breakpoint on `rust_fail`.
50+
useful; to do so, you will need to set a breakpoint on `rust_panic`.
5151

5252
# I submitted a bug, but nobody has commented on it!
5353

0 commit comments

Comments
 (0)
Please sign in to comment.