OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve feature gate error, and return after emitting errors instead of looping forever

Browse Source
This commit is contained in:
Michael Hewson 2017-11-05 14:53:31 -05:00
parent a3f5866fe8
commit 9a592e61ff
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/librustc_typeck/check/wfcheck.rs
View File

@ -20,6 +20,7 @@ use rustc::util::nodemap::{FxHashSet, FxHashMap};
use rustc::middle::lang_items; use rustc::middle::lang_items;
use syntax::ast; use syntax::ast;
use syntax::feature_gate::{self, GateIssue};
use syntax_pos::Span; use syntax_pos::Span;
use errors::DiagnosticBuilder; use errors::DiagnosticBuilder;
@ -481,18 +482,26 @@ impl<'a, 'gcx> CheckTypeWellFormedVisitor<'a, 'gcx> {
if let Ok(InferOk { obligations, value: () }) = eq(self_ty, potential_self_ty) { if let Ok(InferOk { obligations, value: () }) = eq(self_ty, potential_self_ty) {
fcx.register_predicates(obligations); fcx.register_predicates(obligations);
autoderef.finalize(); autoderef.finalize();
break; break
} }
} else { } else {
span_err!(fcx.tcx.sess, span, E0307, "invalid `self` type: {:?}", self_arg_ty); fcx.tcx.sess.diagnostic().mut_span_err(span, &format!("invalid `self` type: {:?}", self_arg_ty))
return; .note(&format!("type must be `{:?}` or a type that dereferences to it`", self_ty))
.help("consider changing to `self`, `&self`, `&mut self`, or `self: Box<Self>`")
.code("E0307".into())
.emit();
return
} }
} }
if let ExplicitSelf::Other = ExplicitSelf::determine(fcx, fcx.param_env, self_ty, self_arg_ty) { if let ExplicitSelf::Other = ExplicitSelf::determine(fcx, fcx.param_env, self_ty, self_arg_ty) {
if !fcx.tcx.sess.features.borrow().arbitrary_self_types { if !fcx.tcx.sess.features.borrow().arbitrary_self_types {
fcx.tcx.sess.span_err(span, "Arbitrary `self` types are experimental"); feature_gate::feature_err(&fcx.tcx.sess.parse_sess, "arbitrary_self_types", span,
GateIssue::Language, "arbitrary `self` types are unstable")
.help("consider changing to `self`, `&self`, `&mut self`, or `self: Box<Self>`")
.emit();
return
} }
} }
} }