X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibrustc_builtin_macros%2Fderiving%2Fdefault.rs;h=72c41ad9745c1ae505cd78f5cea9155b36135c9f;hb=7ae0618e0af852c3e777272a29419f85eaf033cc;hp=d623e1fa4cca4aade819ba38a12cd873be4ad6ad;hpb=b683de4ad79242fdeebcae2afefb72c1530babe9;p=rust.git diff --git a/src/librustc_builtin_macros/deriving/default.rs b/src/librustc_builtin_macros/deriving/default.rs index d623e1fa4cc..72c41ad9745 100644 --- a/src/librustc_builtin_macros/deriving/default.rs +++ b/src/librustc_builtin_macros/deriving/default.rs @@ -2,12 +2,12 @@ use crate::deriving::generic::*; use crate::deriving::path_std; +use rustc_errors::struct_span_err; +use rustc_expand::base::{Annotatable, DummyResult, ExtCtxt}; +use rustc_span::symbol::{kw, sym}; +use rustc_span::Span; use syntax::ast::{Expr, MetaItem}; use syntax::ptr::P; -use syntax::span_err; -use syntax::symbol::{kw, sym}; -use syntax_expand::base::{Annotatable, DummyResult, ExtCtxt}; -use syntax_pos::Span; use rustc_error_codes::*; @@ -74,7 +74,13 @@ fn default_substructure( } }, StaticEnum(..) => { - span_err!(cx, trait_span, E0665, "`Default` cannot be derived for enums, only structs"); + struct_span_err!( + cx.parse_sess.span_diagnostic, + trait_span, + E0665, + "`Default` cannot be derived for enums, only structs" + ) + .emit(); // let compilation continue DummyResult::raw_expr(trait_span, true) }