diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-12-18 13:43:45 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-12-18 16:47:37 +0530 |
| commit | c2902965cb53d2afd09ea2ce7b3f9c314dc7b072 (patch) | |
| tree | 83b7c8e4e6118bfaa26d7be0d82923537c663bcf /src/libsyntax_ext/deriving | |
| parent | cb319fc84fa52773dd31ead8761b1c251e916e88 (diff) | |
| parent | ff0c74f7d47f5261ebda7cb3b9a637e0cfc69104 (diff) | |
| download | rust-c2902965cb53d2afd09ea2ce7b3f9c314dc7b072.tar.gz rust-c2902965cb53d2afd09ea2ce7b3f9c314dc7b072.zip | |
Rollup merge of #30384 - nrc:diagnostics, r=@nikomatsakis
Should make it possible to add JSON or HTML errors. Also tidies up a lot.
Diffstat (limited to 'src/libsyntax_ext/deriving')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 5977144dae7..b76384ffb4a 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -203,7 +203,7 @@ use syntax::ext::base::{ExtCtxt, Annotatable}; use syntax::ext::build::AstBuilder; use syntax::codemap::{self, DUMMY_SP}; use syntax::codemap::Span; -use syntax::diagnostic::SpanHandler; +use syntax::errors::Handler; use syntax::util::move_map::MoveMap; use syntax::owned_slice::OwnedSlice; use syntax::parse::token::{intern, InternedString}; @@ -742,7 +742,7 @@ impl<'a> TraitDef<'a> { } } -fn find_repr_type_name(diagnostic: &SpanHandler, +fn find_repr_type_name(diagnostic: &Handler, type_attrs: &[ast::Attribute]) -> &'static str { let mut repr_type_name = "i32"; for a in type_attrs { |