nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move common code to WhereClause

Browse Source
This commit is contained in:
Esteban Küber 2020-05-29 09:44:41 -07:00
parent 04243710a0
commit 0d18136b77
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustc_hir/hir.rs
View File

@ -525,6 +525,13 @@ impl WhereClause<'_> {
pub fn span_for_predicates_or_empty_place(&self) -> Span {
self.span
}
/// `Span` where further predicates would be suggested, accounting for trailing commas, like
/// in `fn foo<T>(t: T) where T: Foo,` so we don't suggest two trailing commas.
pub fn tail_span_for_suggestion(&self) -> Span {
let end = self.span_for_predicates_or_empty_place().shrink_to_hi();
self.predicates.last().map(|p| p.span()).unwrap_or(end).shrink_to_hi().to(end)
}
}
/// A single predicate in a where-clause.

13
src/librustc_middle/ty/diagnostics.rs
View File

@ -220,22 +220,11 @@ pub fn suggest_constraining_type_param(
}
}
// Account for `fn foo<T>(t: T) where T: Foo,` so we don't suggest two trailing commas.
let end = generics.where_clause.span_for_predicates_or_empty_place().shrink_to_hi();
let where_clause_span = generics
.where_clause
.predicates
.last()
.map(|p| p.span())
.unwrap_or(end)
.shrink_to_hi()
.to(end);
match &param_spans[..] {
&[&param_span] => suggest_restrict(param_span.shrink_to_hi()),
_ => {
err.span_suggestion_verbose(
where_clause_span,
generics.where_clause.tail_span_for_suggestion(),
&msg_restrict_type_further,
format!(", {}: {}", param_name, constraint),
Applicability::MachineApplicable,

11
src/librustc_trait_selection/traits/error_reporting/suggestions.rs
View File

@ -169,17 +169,8 @@ pub trait InferCtxtExt<'tcx> {
}
fn predicate_constraint(generics: &hir::Generics<'_>, pred: String) -> (Span, String) {
let end = generics.where_clause.span_for_predicates_or_empty_place().shrink_to_hi();
(
// Account for `where T: Foo,` so we don't suggest two trailing commas.
generics
.where_clause
.predicates
.last()
.map(|p| p.span())
.unwrap_or(end)
.shrink_to_hi()
.to(end),
generics.where_clause.tail_span_for_suggestion(),
format!(
"{} {}",
if !generics.where_clause.predicates.is_empty() { "," } else { " where" },