@@ -10,7 +10,7 @@ import middle::resolve;
10
10
import middle:: ty;
11
11
import middle:: typeck;
12
12
import middle:: typestate_check;
13
- import back:: Link ;
13
+ import back:: link ;
14
14
import lib:: llvm;
15
15
import util:: common;
16
16
@@ -29,7 +29,7 @@ import std::getopts::optmulti;
29
29
import std:: getopts:: optflag;
30
30
import std:: getopts:: opt_present;
31
31
32
- import back:: Link :: output_type;
32
+ import back:: link :: output_type;
33
33
34
34
fn default_environment ( session:: session sess,
35
35
str argv0 ,
@@ -87,7 +87,7 @@ fn compile_input(session::session sess,
87
87
auto p = parser:: new_parser ( sess, env, def, input, 0 u, 0 u) ;
88
88
auto crate = time ( time_passes, "parsing" ,
89
89
bind parse_input ( sess, p, input) ) ;
90
- if ( sess. get_opts ( ) . output_type == Link :: output_type_none) { ret; }
90
+ if ( sess. get_opts ( ) . output_type == link :: output_type_none) { ret; }
91
91
92
92
crate = time ( time_passes, "external crate reading" ,
93
93
bind creader:: read_crates ( sess, crate ) ) ;
@@ -112,7 +112,7 @@ fn compile_input(session::session sess,
112
112
type_cache, output) ) ;
113
113
114
114
time[ ( ) ] ( time_passes, "LLVM passes" ,
115
- bind Link :: Write :: run_passes ( sess, llmod, output) ) ;
115
+ bind link :: write :: run_passes ( sess, llmod, output) ) ;
116
116
}
117
117
118
118
fn pretty_print_input ( session:: session sess,
@@ -241,13 +241,13 @@ fn main(vec[str] args) {
241
241
auto output_file = getopts:: opt_maybe_str( match, "o" ) ;
242
242
auto library_search_paths = getopts:: opt_strs( match, "L" ) ;
243
243
244
- auto output_type = Link :: output_type_bitcode;
244
+ auto output_type = link :: output_type_bitcode;
245
245
if ( opt_present( match , "parse-only" ) ) {
246
- output_type = Link :: output_type_none;
246
+ output_type = link :: output_type_none;
247
247
} else if ( opt_present( match , "S" ) ) {
248
- output_type = Link :: output_type_assembly;
248
+ output_type = link :: output_type_assembly;
249
249
} else if ( opt_present( match , "c" ) ) {
250
- output_type = Link :: output_type_object;
250
+ output_type = link :: output_type_object;
251
251
}
252
252
253
253
auto verify = !opt_present( match , "noverify" ) ;
@@ -317,10 +317,10 @@ fn main(vec[str] args) {
317
317
let vec[ str] parts = _str:: split ( ifile, '.' as u8 ) ;
318
318
_vec:: pop[ str] ( parts) ;
319
319
alt ( output_type) {
320
- case ( Link :: output_type_none) { parts += vec ( "pp" ) ; }
321
- case ( Link :: output_type_bitcode) { parts += vec ( "bc" ) ; }
322
- case ( Link :: output_type_assembly) { parts += vec ( "s" ) ; }
323
- case ( Link :: output_type_object) { parts += vec ( "o" ) ; }
320
+ case ( link :: output_type_none) { parts += vec ( "pp" ) ; }
321
+ case ( link :: output_type_bitcode) { parts += vec ( "bc" ) ; }
322
+ case ( link :: output_type_assembly) { parts += vec ( "s" ) ; }
323
+ case ( link :: output_type_object) { parts += vec ( "o" ) ; }
324
324
}
325
325
auto ofile = _str:: connect ( parts, "." ) ;
326
326
compile_input ( sess, env, ifile, ofile) ;
0 commit comments