---

yaml
---
r: 52699
b: refs/heads/dist-snap
c: 16ea4b0
h: refs/heads/master
i:
  52697: ecbb1ec
  52695: 915b459
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 409d8af3c4455638d017b4d34a16230c34d94771
+refs/heads/dist-snap: 16ea4b06abf4bbcec05cccf58d644085f3862541
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustdoc/astsrv.rs

@@ -135,65 +135,12 @@ fn build_ctxt(sess: Session,
 
 fn build_session() -> Session {
     let sopts: @options = basic_options();
-    let codemap = @codemap::CodeMap::new();
-    let error_handlers = build_error_handlers(codemap);
-    let {emitter, span_handler} = error_handlers;
+    let emitter = syntax::diagnostic::emit;
 
-    let session = driver::build_session_(sopts, codemap, emitter,
-                                         span_handler);
+    let session = driver::build_session(sopts, emitter);
     session
 }
 
-type ErrorHandlers = {
-    emitter: diagnostic::emitter,
-    span_handler: diagnostic::span_handler
-};
-
-// Build a custom error handler that will allow us to ignore non-fatal
-// errors
-fn build_error_handlers(
-    codemap: @codemap::CodeMap
-) -> ErrorHandlers {
-
-    struct DiagnosticHandler {
-        inner: diagnostic::handler,
-    }
-
-    impl DiagnosticHandler: diagnostic::handler {
-        fn fatal(msg: &str) -> ! { self.inner.fatal(msg) }
-        fn err(msg: &str) { self.inner.err(msg) }
-        fn bump_err_count() {
-            self.inner.bump_err_count();
-        }
-        fn has_errors() -> bool { self.inner.has_errors() }
-        fn abort_if_errors() { self.inner.abort_if_errors() }
-        fn warn(msg: &str) { self.inner.warn(msg) }
-        fn note(msg: &str) { self.inner.note(msg) }
-        fn bug(msg: &str) -> ! { self.inner.bug(msg) }
-        fn unimpl(msg: &str) -> ! { self.inner.unimpl(msg) }
-        fn emit(cmsp: Option<(@codemap::CodeMap, codemap::span)>,
-                msg: &str, lvl: diagnostic::level) {
-            self.inner.emit(cmsp, msg, lvl)
-        }
-    }
-
-    let emitter = fn@(cmsp: Option<(@codemap::CodeMap, codemap::span)>,
-                       msg: &str, lvl: diagnostic::level) {
-        diagnostic::emit(cmsp, msg, lvl);
-    };
-    let inner_handler = diagnostic::mk_handler(Some(emitter));
-    let handler = DiagnosticHandler {
-        inner: inner_handler,
-    };
-    let span_handler = diagnostic::mk_span_handler(
-        handler as diagnostic::handler, codemap);
-
-    {
-        emitter: emitter,
-        span_handler: span_handler
-    }
-}
-
 #[test]
 fn should_prune_unconfigured_items() {
     let source = ~"#[cfg(shut_up_and_leave_me_alone)]fn a() { }";