diff --git a/src/cargo/cargo.rs b/src/cargo/cargo.rs
index c33aaa000cf8..aac5339a540e 100644
--- a/src/cargo/cargo.rs
+++ b/src/cargo/cargo.rs
@@ -6,6 +6,7 @@ use std;
 import rustc::syntax::{ast, codemap, visit};
 import rustc::syntax::parse::parser;
 import rustc::util::filesearch::get_cargo_root;
+import rustc::driver::diagnostic;
 
 import std::fs;
 import std::generic_os;
@@ -99,7 +100,12 @@ fn load_link(mis: [@ast::meta_item]) -> (option::t<str>,
 }
 
 fn load_pkg(filename: str) -> option::t<pkg> {
-    let sess = @{cm: codemap::new_codemap(), mutable next_id: 0};
+    let cm = codemap::new_codemap();
+    let sess = @{
+        cm: cm,
+        mutable next_id: 0,
+        diagnostic: diagnostic::mk_codemap_handler(cm)
+    };
     let c = parser::parse_crate_from_crate_file(filename, [], sess);
 
     let name = none;
diff --git a/src/fuzzer/fuzzer.rs b/src/fuzzer/fuzzer.rs
index dfd3b69d0910..9800032ed987 100644
--- a/src/fuzzer/fuzzer.rs
+++ b/src/fuzzer/fuzzer.rs
@@ -4,6 +4,7 @@ import io::writer_util;
 import rustc::syntax::{ast, ast_util, fold, visit, codemap};
 import rustc::syntax::parse::parser;
 import rustc::syntax::print::pprust;
+import rustc::driver::diagnostic;
 
 tag test_mode { tm_converge; tm_run; }
 type context = { mode: test_mode }; // + rng
@@ -259,10 +260,13 @@ fn check_variants_T<T: copy>(
                 // It would be best to test the *crate* for stability, but testing the
                 // string for stability is easier and ok for now.
                 let str3 =
-                    as_str(bind pprust::print_crate(codemap, crate2,
-                                                    filename,
-                                                    io::string_reader(""), _,
-                                                    pprust::no_ann()));
+                    as_str(bind pprust::print_crate(
+                        codemap,
+                        diagnostic::mk_codemap_handler(codemap),
+                        crate2,
+                        filename,
+                        io::string_reader(""), _,
+                        pprust::no_ann()));
                 alt cx.mode {
                   tm_converge. {
                     check_roundtrip_convergence(str3, 1u);
@@ -411,11 +415,18 @@ fn check_compiling(filename: str) -> happiness {
 
 fn parse_and_print(code: str) -> str {
     let filename = "tmp.rs";
-    let sess = @{cm: codemap::new_codemap(), mutable next_id: 0};
+    let cm = codemap::new_codemap();
+    let sess = @{
+        cm: cm,
+        mutable next_id: 0,
+        diagnostic: diagnostic::mk_codemap_handler(cm)
+    };
     write_file(filename, code);
     let crate = parser::parse_crate_from_source_str(
         filename, code, [], sess);
-    ret as_str(bind pprust::print_crate(sess.cm, crate,
+    ret as_str(bind pprust::print_crate(sess.cm,
+                                        sess.diagnostic,
+                                        crate,
                                         filename,
                                         io::string_reader(code), _,
                                         pprust::no_ann()));
@@ -551,13 +562,20 @@ fn check_variants(files: [str], cx: context) {
         }
 
         log(error, "check_variants: " + file);
-        let sess = @{cm: codemap::new_codemap(), mutable next_id: 0};
+        let cm = codemap::new_codemap();
+        let sess = @{
+            cm: cm,
+            mutable next_id: 0,
+            diagnostic: diagnostic::mk_codemap_handler(cm)
+        };
         let crate =
             parser::parse_crate_from_source_str(
                 file,
                 s, [], sess);
         #error("%s",
-               as_str(bind pprust::print_crate(sess.cm, crate,
+               as_str(bind pprust::print_crate(sess.cm,
+                                               sess.diagnostic,
+                                               crate,
                                                file,
                                                io::string_reader(s), _,
                                                pprust::no_ann())));
diff --git a/src/rustdoc/rustdoc.rs b/src/rustdoc/rustdoc.rs
index ef1e96eaefc6..d743eafcbcae 100755
--- a/src/rustdoc/rustdoc.rs
+++ b/src/rustdoc/rustdoc.rs
@@ -7,6 +7,7 @@ use rustc;
 
 import option;
 import option::{some, none};
+import rustc::driver::diagnostic;
 import rustc::syntax::ast;
 import rustc::syntax::codemap;
 import rustc::syntax::parse::parser;
@@ -189,7 +190,12 @@ fn main(argv: [str]) {
         ret;
     }
 
-    let sess = @{cm: codemap::new_codemap(), mutable next_id: 0};
+    let cm = codemap::new_codemap();
+    let sess = @{
+        cm: cm,
+        mutable next_id: 0,
+        diagnostic: diagnostic::mk_codemap_handler(cm)
+    };
     let rd = { ps: pprust::rust_printer(w), w: w };
     doc_header(rd, argv[1]);
     let p = parser::parse_crate_from_source_file(argv[1], [], sess);