diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/traits/error_reporting.rs | 6 | ||||
| -rw-r--r-- | src/librustc_errors/lib.rs | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs index 1321d5348a2..ea29cc0d93f 100644 --- a/src/librustc/traits/error_reporting.rs +++ b/src/librustc/traits/error_reporting.rs @@ -33,7 +33,7 @@ use crate::ty::subst::Subst; use crate::ty::SubtypePredicate; use crate::util::nodemap::{FxHashMap, FxHashSet}; -use errors::{Applicability, DiagnosticBuilder, pluralise, Style}; +use errors::{Applicability, DiagnosticBuilder, pluralize, Style}; use std::fmt; use syntax::ast; use syntax::symbol::{sym, kw}; @@ -1341,7 +1341,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { param_env, new_trait_ref.to_predicate(), ); - if self.predicate_may_hold(&new_obligation) { + if self.predicate_must_hold_modulo_regions(&new_obligation) { if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) { // We have a very specific type of error, where just borrowing this argument // might solve the problem. In cases like this, the important part is the @@ -1371,7 +1371,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { span, "consider borrowing here", format!("&{}", snippet), - Applicability::MachineApplicable, + Applicability::MaybeIncorrect, ); return true; } diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index 17765ef9dee..fb34d844fda 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -38,6 +38,7 @@ pub mod registry; mod styled_buffer; mod lock; pub mod json; +pub use snippet::Style; pub type PResult<'a, T> = Result<T, DiagnosticBuilder<'a>>; |