Skip to content

Commit dfb0e6a

Browse files
committed
---
yaml --- r: 120426 b: refs/heads/dist-snap c: 1fb08f1 h: refs/heads/master v: v3
1 parent d137578 commit dfb0e6a

File tree

9 files changed

+276
-249
lines changed

9 files changed

+276
-249
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 28bcef85e402a32cf44b740f128e5f9bbd21c0a0
9+
refs/heads/dist-snap: 1fb08f11b75259ad4f208e25fab6c7acc1bccd89
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/compiletest/compiletest.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,7 @@ pub fn parse_config(args: Vec<StrBuf> ) -> Config {
101101
}
102102

103103
let matches =
104-
&match getopts::getopts(args_.iter()
105-
.map(|x| x.to_owned())
106-
.collect::<Vec<_>>()
107-
.as_slice(),
108-
groups.as_slice()) {
104+
&match getopts::getopts(args_.as_slice(), groups.as_slice()) {
109105
Ok(m) => m,
110106
Err(f) => fail!("{}", f.to_err_msg())
111107
};
@@ -146,15 +142,18 @@ pub fn parse_config(args: Vec<StrBuf> ) -> Config {
146142
build_base: opt_path(matches, "build-base"),
147143
aux_base: opt_path(matches, "aux-base"),
148144
stage_id: matches.opt_str("stage-id").unwrap().to_strbuf(),
149-
mode: FromStr::from_str(matches.opt_str("mode").unwrap()).expect("invalid mode"),
145+
mode: FromStr::from_str(matches.opt_str("mode")
146+
.unwrap()
147+
.as_slice()).expect("invalid mode"),
150148
run_ignored: matches.opt_present("ignored"),
151149
filter: filter,
152150
logfile: matches.opt_str("logfile").map(|s| Path::new(s)),
153151
save_metrics: matches.opt_str("save-metrics").map(|s| Path::new(s)),
154152
ratchet_metrics:
155153
matches.opt_str("ratchet-metrics").map(|s| Path::new(s)),
156154
ratchet_noise_percent:
157-
matches.opt_str("ratchet-noise-percent").and_then(|s| from_str::<f64>(s)),
155+
matches.opt_str("ratchet-noise-percent")
156+
.and_then(|s| from_str::<f64>(s.as_slice())),
158157
runtool: matches.opt_str("runtool").map(|x| x.to_strbuf()),
159158
host_rustcflags: matches.opt_str("host-rustcflags")
160159
.map(|x| x.to_strbuf()),

0 commit comments

Comments
 (0)