Skip to content

Commit 9898485

Browse files
committed
Merge pull request #4613 from erickt/incoming
convert most of libcore and libstd to structs, work around tzset race
2 parents f19e168 + 11fd2be commit 9898485

File tree

31 files changed

+1051
-914
lines changed

31 files changed

+1051
-914
lines changed

src/compiletest/compiletest.rc

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,10 @@ fn run_tests(config: config) {
158158
}
159159

160160
fn test_opts(config: config) -> test::TestOpts {
161-
{filter:
162-
match config.filter {
163-
option::Some(s) => option::Some(s),
164-
option::None => option::None
165-
},
166-
run_ignored: config.run_ignored,
167-
logfile:
168-
match config.logfile {
169-
option::Some(s) => option::Some(s.to_str()),
170-
option::None => option::None
171-
}
161+
test::TestOpts {
162+
filter: config.filter,
163+
run_ignored: config.run_ignored,
164+
logfile: config.logfile.map(|s| s.to_str()),
172165
}
173166
}
174167

0 commit comments

Comments
 (0)