user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix fallout in rusti & rustpkg.

Browse source
This commit is contained in:
Luqman Aden 2013-02-19 00:01:03 -08:00 • committed by Tim Chevalier
parent cd82c4566b
commit 601c2edb4d
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librusti/rusti.rc
View file

@ -131,7 +131,7 @@ fn record(repl: Repl, blk: @ast::blk, intr: @token::ident_interner) -> Repl {
/// Run an input string in a Repl, returning the new Repl.
fn run(repl: Repl, input: ~str) -> Repl {
let options: @session::options = @{
let options = @session::options {
crate_type: session::unknown_crate,
binary: repl.binary,
addl_lib_search_paths: repl.lib_search_paths.map(|p| Path(*p)),
@ -157,7 +157,7 @@ fn run(repl: Repl, input: ~str) -> Repl {
let outputs = driver::build_output_filenames(wrapped, &None, &None, sess);
debug!("calling compile_upto");
let {crate: crate, tcx: _} = driver::compile_upto(sess, cfg, wrapped,
let (crate, _) = driver::compile_upto(sess, cfg, wrapped,
driver::cu_everything,
Some(outputs));
@ -196,7 +196,7 @@ fn run(repl: Repl, input: ~str) -> Repl {
fn compile_crate(src_filename: ~str, binary: ~str) -> Option<bool> {
match do task::try {
let src_path = Path(src_filename);
let options: @session::options = @{
let options = @session::options {
binary: binary,
addl_lib_search_paths: ~[os::getcwd()],
.. *session::basic_options()

4
src/librustpkg/rustpkg.rc
View file

@ -64,7 +64,7 @@ impl PackageScript {
}
let binary = os::args()[0];
let options: @session::options = @{
let options = @session::options {
binary: binary,
crate_type: session::bin_crate,
.. *session::basic_options()
@ -72,7 +72,7 @@ impl PackageScript {
let input = driver::file_input(script);
let sess = driver::build_session(options, diagnostic::emit);
let cfg = driver::build_configuration(sess, binary, input);
let {crate, _} = driver::compile_upto(sess, cfg, input,
let (crate, _) = driver::compile_upto(sess, cfg, input,
driver::cu_parse, None);
let mut id = None;
let mut vers = None;

6
src/librustpkg/util.rs
View file

@ -599,7 +599,7 @@ pub fn compile_input(sysroot: Option<Path>, input: driver::input, dir: &Path,
let test_dir = dir.push(~"test");
let binary = os::args()[0];
let matches = getopts(flags, driver::optgroups()).get();
let options = @{
let options = @session::options {
crate_type: session::unknown_crate,
optimize: if opt { session::Aggressive } else { session::No },
test: test,
@ -612,7 +612,7 @@ pub fn compile_input(sysroot: Option<Path>, input: driver::input, dir: &Path,
crate_cfg.push(attr::mk_word_item(@cfg));
}
let options = @{
let options = @session::options {
cfg: vec::append(options.cfg, crate_cfg),
.. *options
};
@ -620,7 +620,7 @@ pub fn compile_input(sysroot: Option<Path>, input: driver::input, dir: &Path,
let cfg = driver::build_configuration(sess, binary, input);
let mut outputs = driver::build_output_filenames(input, &None, &None,
sess);
let {crate, _} = driver::compile_upto(sess, cfg, input, driver::cu_parse,
let (crate, _) = driver::compile_upto(sess, cfg, input, driver::cu_parse,
Some(outputs));
let mut name = None;