Skip to content

Commit bb56a75

Browse files
committed
Convert main functions to istrs. Issue #855
1 parent 3fe743b commit bb56a75

23 files changed

+26
-30
lines changed

src/comp/driver/rustc.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,7 @@ fn opts() -> [getopts::opt] {
467467
optflag(~"gc")];
468468
}
469469

470-
fn main(args: [str]) {
471-
let args = istr::from_estrs(args);
470+
fn main(args: [istr]) {
472471
let binary = vec::shift(args);
473472
let binary_dir = fs::dirname(binary);
474473
let match =

src/fuzzer/fuzzer.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,7 @@ fn check_variants(files: &[istr]) {
375375
}
376376
}
377377
378-
fn main(args: [str]) {
379-
let args = istr::from_estrs(args);
378+
fn main(args: [istr]) {
380379
if vec::len(args) != 2u {
381380
log_err #ifmt["usage: %s <testdir>", args[0]];
382381
ret;

src/test/bench/shootout-fannkuchredux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ fn fannkuch(n: int) -> int {
5656
ret flips;
5757
}
5858

59-
fn main(args: [str]) {
59+
fn main(args: [istr]) {
6060
let n = 7;
6161
log #ifmt["Pfannkuchen(%d) = %d", n, fannkuch(n)];
6262
}

src/test/bench/shootout-fasta.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn make_repeat_fasta(id: &istr, desc: &istr, s: &istr, n: int) {
6868

6969
fn acid(ch: char, prob: u32) -> aminoacids { ret {ch: ch, prob: prob}; }
7070

71-
fn main(args: [str]) {
71+
fn main(args: [istr]) {
7272
let iub: [aminoacids] =
7373
make_cumulative([acid('a', 27u32), acid('c', 12u32), acid('g', 12u32),
7474
acid('t', 27u32), acid('B', 2u32), acid('D', 2u32),

src/test/bench/shootout-pfib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ fn stress(num_tasks: int) {
7979
for t in tasks { task::join(t); }
8080
}
8181

82-
fn main(argv: [str]) {
83-
let argv = istr::from_estrs(argv);
82+
fn main(argv: [istr]) {
8483
if vec::len(argv) == 1u {
8584
assert (fib(8) == 21);
8685
log fib(8);

src/test/compile-fail/bad-expr-path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
mod m1 { }
44

5-
fn main(args: [str]) { log m1::a; }
5+
fn main(args: [istr]) { log m1::a; }

src/test/compile-fail/bad-expr-path2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ mod m1 {
44
mod a { }
55
}
66

7-
fn main(args: [str]) { log m1::a; }
7+
fn main(args: [istr]) { log m1::a; }

src/test/compile-fail/import.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ import zed::baz;
44
mod zed {
55
fn bar() { log "bar"; }
66
}
7-
fn main(args: [str]) { bar(); }
7+
fn main(args: [istr]) { bar(); }

src/test/compile-fail/import2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ mod baz { }
44
mod zed {
55
fn bar() { log "bar3"; }
66
}
7-
fn main(args: [str]) { bar(); }
7+
fn main(args: [istr]) { bar(); }

src/test/compile-fail/import3.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// error-pattern: unresolved modulename
22
import main::bar;
33

4-
fn main(args: [str]) { log "foo"; }
4+
fn main(args: [istr]) { log "foo"; }

0 commit comments

Comments
 (0)