From cf9ed08a5091733b6b0c6cc38e53542b05e8dd04 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sun, 19 Jun 2011 03:24:42 -0700
Subject: Revert previous 6 commits. Hopefully put out Windows fire.

Revert "rustc: Export only what's needed from middle::ty"

This reverts commit 4255d58aa5db2a05362c4435a0e807205e1b8ed7.

Revert "rustc: Make name resolution errors less fatal"

This reverts commit b8ab9ea89c16c60237e7660804f4321f59ae0435.

Revert "rustc: Make import resolution errors less fatal"

This reverts commit 92a8ae94b971206bf0502da3dc5f416fcb24cc36.

Revert "rustc: Export only what's used from middle::resolve"

This reverts commit 4539a2cf7ad99851a165c98ed2f4e4a475cffd7d.

Revert "rustc: Re-introduce session.span_err, session.err"

This reverts commit 7fe9a88e31ae07f2fd89f6715efedd7e3edf49e6.

Revert "rustc: Rename session.span_err -> span_fatal, err -> fatal"

This reverts commit c394a7f49ac29a099994e243017065de2ff97f2a.
---
 src/comp/driver/rustc.rs   | 12 ++++++------
 src/comp/driver/session.rs | 24 +++++-------------------
 2 files changed, 11 insertions(+), 25 deletions(-)

(limited to 'src/comp/driver')

diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 208fb5048c0..abcaa07241d 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -59,7 +59,7 @@ fn parse_input(session::session sess, parser::parser p, str input) ->
             parser::parse_crate_from_crate_file(p)
         } else if (str::ends_with(input, ".rs")) {
             parser::parse_crate_from_source_file(p)
-        } else { sess.fatal("unknown input file type: " + input); fail };
+        } else { sess.err("unknown input file type: " + input); fail };
 }
 
 fn time[T](bool do_it, str what, fn() -> T  thunk) -> T {
@@ -272,7 +272,7 @@ fn build_session(@session::options sopts) -> session::session {
     auto target_crate_num = 0;
     auto sess =
         session::session(target_crate_num, target_cfg, sopts, crate_cache,
-                         front::codemap::new_codemap(), 0u);
+                         front::codemap::new_codemap());
     ret sess;
 }
 
@@ -282,7 +282,7 @@ fn parse_pretty(session::session sess, &str name) -> pp_mode {
     } else if (str::eq(name, "typed")) {
         ret ppm_typed;
     } else if (str::eq(name, "identified")) { ret ppm_identified; }
-    sess.fatal("argument to `pretty` must be one of `normal`, `typed`, or " +
+    sess.err("argument to `pretty` must be one of `normal`, `typed`, or " +
                  "`identified`");
 }
 
@@ -321,16 +321,16 @@ fn main(vec[str] args) {
     auto glue = opt_present(match, "glue");
     if (glue) {
         if (n_inputs > 0u) {
-            sess.fatal("No input files allowed with --glue.");
+            sess.err("No input files allowed with --glue.");
         }
         auto out = option::from_maybe[str]("glue.bc", output_file);
         middle::trans::make_common_glue(sess, out);
         ret;
     }
     if (n_inputs == 0u) {
-        sess.fatal("No input filename given.");
+        sess.err("No input filename given.");
     } else if (n_inputs > 1u) {
-        sess.fatal("Multiple input filenames provided.");
+        sess.err("Multiple input filenames provided.");
     }
     auto ifile = match.free.(0);
     let str saved_out_filename = "";
diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs
index 14b8213ce3c..9c810e30baf 100644
--- a/src/comp/driver/session.rs
+++ b/src/comp/driver/session.rs
@@ -66,34 +66,20 @@ obj session(ast::crate_num cnum,
             @config targ_cfg,
             @options opts,
             map::hashmap[int, crate_metadata] crates,
-            codemap::codemap cm,
-            mutable uint err_count) {
+            codemap::codemap cm) {
     fn get_targ_cfg() -> @config { ret targ_cfg; }
     fn get_opts() -> @options { ret opts; }
     fn get_targ_crate_num() -> ast::crate_num { ret cnum; }
-    fn span_fatal(span sp, str msg) -> ! {
+    fn span_err(span sp, str msg) -> ! {
         // FIXME: Use constants, but rustboot doesn't know how to export them.
 
         emit_diagnostic(some(sp), msg, "error", 9u8, cm);
         fail;
     }
-    fn fatal(str msg) -> ! {
+    fn err(str msg) -> ! {
         emit_diagnostic(none[span], msg, "error", 9u8, cm);
         fail;
     }
-    fn span_err(span sp, str msg) {
-        emit_diagnostic(some(sp), msg, "error", 9u8, cm);
-        err_count += 1u;
-    }
-    fn err(span sp, str msg) {
-        emit_diagnostic(some(sp), msg, "error", 9u8, cm);
-        err_count += 1u;
-    }
-    fn abort_if_errors() {
-        if (err_count > 0u) {
-            self.fatal("aborting due to previous errors");
-        }
-    }
     fn span_warn(span sp, str msg) {
         // FIXME: Use constants, but rustboot doesn't know how to export them.
 
@@ -108,10 +94,10 @@ obj session(ast::crate_num cnum,
         emit_diagnostic(some(sp), msg, "note", 10u8, cm);
     }
     fn span_bug(span sp, str msg) -> ! {
-        self.span_fatal(sp, #fmt("internal compiler error %s", msg));
+        self.span_err(sp, #fmt("internal compiler error %s", msg));
     }
     fn bug(str msg) -> ! {
-        self.fatal(#fmt("internal compiler error %s", msg));
+        self.err(#fmt("internal compiler error %s", msg));
     }
     fn span_unimpl(span sp, str msg) -> ! {
         self.span_bug(sp, "unimplemented " + msg);
-- 
cgit 1.4.1-3-g733a5