Skip to content

Commit 671093f

Browse files
committed
---
yaml --- r: 2739 b: refs/heads/master c: 65ec38c h: refs/heads/master i: 2737: 6b05f4d 2735: 7bafdc6 v: v3
1 parent d6e3f2b commit 671093f

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: c1122a67073f8587c7cf4d4a68fd37cdabed4298
2+
refs/heads/master: 65ec38c09666c03435a420234a3b1755391d95ef

trunk/src/comp/driver/rustc.rs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,15 @@ fn default_environment(session::session sess,
4444
case (session::os_linux) { libc = "libc.so.6"; }
4545
}
4646

47-
ret
48-
[
49-
// Target bindings.
50-
tup("target_os", eval::val_str(std::os::target_os())),
51-
tup("target_arch", eval::val_str("x86")),
52-
tup("target_libc", eval::val_str(libc)),
53-
54-
// Build bindings.
55-
tup("build_compiler", eval::val_str(argv0)),
56-
tup("build_input", eval::val_str(input))
57-
];
47+
ret [// Target bindings.
48+
tup("target_os", eval::val_str(std::os::target_os())),
49+
tup("target_arch", eval::val_str("x86")),
50+
tup("target_libc", eval::val_str(libc)),
51+
52+
// Build bindings.
53+
tup("build_compiler", eval::val_str(argv0)),
54+
tup("build_input", eval::val_str(input))
55+
];
5856
}
5957

6058
fn parse_input(session::session sess,
@@ -286,8 +284,7 @@ fn main(vec[str] args) {
286284
if (opt_present(match, "O")) {
287285
optLevel = 2u;
288286
if (opt_present(match, "OptLevel")) {
289-
log
290-
("error: -O and --OptLevel both provided");
287+
log_err "error: -O and --OptLevel both provided";
291288
fail;
292289
}
293290
}
@@ -302,14 +299,13 @@ fn main(vec[str] args) {
302299
case ("2") { optLevel = 2u; }
303300
case ("3") { optLevel = 3u; }
304301
case (_) {
305-
log
306-
("error: optimization level needs to be between 0-3");
302+
log_err "error: optimization level needs to be between 0-3";
307303
fail;
308304
}
309305
}
310306
}
311307
case (none[str]) {
312-
log("error: expected optimization level after --OptLevel=");
308+
log_err "error: expected optimization level after --OptLevel=";
313309
fail;
314310
}
315311
}

0 commit comments

Comments
 (0)