Skip to content

Commit 6705e8e

Browse files
committed
---
yaml --- r: 55209 b: refs/heads/snap-stage3 c: e9688fc h: refs/heads/master i: 55207: 3558224 v: v3
1 parent 7f3981e commit 6705e8e

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 5fee32457fdb9ad495c9f19fa59e8b9b6c34f48b
4+
refs/heads/snap-stage3: e9688fcfe3d345ae34e25c3bd51f878be4410d96
55
refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/compiletest/header.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,13 @@ pub fn load_props(testfile: &Path) -> TestProps {
8282
}
8383

8484
pub fn is_test_ignored(config: config, testfile: &Path) -> bool {
85-
let mut found = false;
8685
for iter_header(testfile) |ln| {
8786
if parse_name_directive(ln, ~"xfail-test") { return true; }
8887
if parse_name_directive(ln, xfail_target()) { return true; }
8988
if config.mode == common::mode_pretty &&
9089
parse_name_directive(ln, ~"xfail-pretty") { return true; }
9190
};
92-
return found;
91+
return true;
9392

9493
fn xfail_target() -> ~str {
9594
~"xfail-" + str::from_slice(os::SYSNAME)

branches/snap-stage3/src/compiletest/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ fn run_rpass_test(config: config, props: TestProps, testfile: &Path) {
106106
fatal_ProcRes(~"test run failed!", ProcRes);
107107
}
108108
} else {
109-
let mut ProcRes = jit_test(config, props, testfile);
109+
let ProcRes = jit_test(config, props, testfile);
110110
111111
if ProcRes.status != 0 { fatal_ProcRes(~"jit failed!", ProcRes); }
112112
}

branches/snap-stage3/src/libsyntax/ast_util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use ast::*;
1212
use ast;
1313
use ast_util;
14-
use codemap::{span, dummy_sp, spanned};
14+
use codemap::{span, spanned};
1515
use parse::token;
1616
use visit;
1717
use opt_vec;

branches/snap-stage3/src/libsyntax/parse/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use parse::token::{ident_interner, mk_ident_interner};
2424
use core::io;
2525
use core::option::{None, Option, Some};
2626
use core::path::Path;
27-
use core::result::{Err, Ok, Result};
27+
use core::result::{Err, Ok};
2828

2929
pub mod lexer;
3030
pub mod parser;

0 commit comments

Comments
 (0)