---

yaml
---
r: 277949
b: refs/heads/auto
c: 2ba5fac
h: refs/heads/master
i:
  277947: 0c9f1d7

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 5974e5b294ee3b67054a31eae2a4b9bab950a119
+refs/heads/auto: 2ba5fac1a460de9936b85f9459668b0992f21f06
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/librustc_driver/lib.rs

@@ -91,9 +91,8 @@ use std::thread;
 
 use rustc::session::early_error;
 
-use syntax::{ast, errors, diagnostic};
-use syntax::codemap::MultiSpan;
-use syntax::parse::{self, PResult};
+use syntax::{ast, errors, diagnostics};
+use syntax::codemap::{CodeMap, FileLoader, RealFileLoader, MultiSpan};
 use syntax::errors::emitter::Emitter;
 use syntax::feature_gate::{GatedCfg, UnstableFeatures};
 use syntax::parse::{self, PResult, token};

branches/auto/src/librustc_resolve/lib.rs

@@ -1784,8 +1784,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
 
                 // If it's a typedef, give a note
                 if let Def::TyAlias(..) = path_res.base_def {
-                    err.note(trait_path.span,
-                             "`type` aliases cannot be used for traits");
+                    err.note("`type` aliases cannot be used for traits");
 
                     let definition_site = {
                         let segments = &trait_path.segments;

branches/auto/src/libsyntax_ext/deriving/mod.rs

@@ -204,9 +204,9 @@ macro_rules! derive_traits {
                                         sp, feature_gate::EXPLAIN_DERIVE_UNDERSCORE,
                                     );
                                     if option_env!("CFG_DISABLE_UNSTABLE_FEATURES").is_none() {
-                                        w.fileline_help(
-                                            sp, &format!("add #![feature(custom_derive)] to \
-                                                          the crate attributes to enable")
+                                        w.help(
+                                            &format!("add #![feature(custom_derive)] to \
+                                                      the crate attributes to enable")
                                         );
                                     }
                                     w.emit();