Merge branch 'master' of git://github.com/graydon/rust

2 files changed, 11 insertions, 2 deletions

diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 312166c4..f0ce9a95 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -203,8 +203,8 @@ impure fn main(vec[str] args) {
                 alt (output_file) {
                     case (none[str]) {
                         let vec[str] parts = _str.split(ifile, '.' as u8);
-                        parts = _vec.pop[str](parts);
-                        parts += ".bc";
+                        _vec.pop[str](parts);
+                        parts += vec(".bc");
                         auto ofile = _str.concat(parts);
                         compile_input(sess, env, ifile, ofile, shared,
                                       library_search_paths);
diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs
index e23dbeed..605774fe 100644
--- a/src/comp/driver/session.rs
+++ b/src/comp/driver/session.rs
@@ -45,6 +45,15 @@ obj session(cfg targ) {
         fail;
     }
 
+    fn span_unimpl(span sp, str msg) {
+        log #fmt("%s:%u:%u:%u:%u: error: unimplemented %s",
+                 sp.filename,
+                 sp.lo.line, sp.lo.col,
+                 sp.hi.line, sp.hi.col,
+                 msg);
+        fail;
+    }
+
     fn unimpl(str msg) {
         log #fmt("error: unimplemented %s", msg);
         fail;