diff options
| author | bors <bors@rust-lang.org> | 2019-06-19 12:41:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-19 12:41:38 +0000 |
| commit | e79b2a18a21e6b178d73473bb8fdbf3d18c66051 (patch) | |
| tree | 093258b3615472cfd3dbad9238abc18c1cdc0361 /src/libsyntax | |
| parent | 9cb052acfb25c12d5e8960f9ea53b69a2f19b0e8 (diff) | |
| parent | fdeb58151370c1a65fa1ff23e7d4b304fca01d2a (diff) | |
| download | rust-e79b2a18a21e6b178d73473bb8fdbf3d18c66051.tar.gz rust-e79b2a18a21e6b178d73473bb8fdbf3d18c66051.zip | |
Auto merge of #61172 - matthewjasper:cleanup-implied-bounds-lint, r=varkor
Improve the explicit_outlives_requirements lint * Don't use Strings to compare parameters * Extend the lint to lifetime bounds * Extend the lint to enums and unions * Use the correct span for where clauses in tuple structs * Try to early-out where possible * Remove unnecessary bounds in rustc crates
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/mut_visit.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 1 |
4 files changed, 1 insertions, 7 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 54cd4035a7b..b1a62ac81d0 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -362,7 +362,6 @@ impl Default for Generics { Generics { params: Vec::new(), where_clause: WhereClause { - id: DUMMY_NODE_ID, predicates: Vec::new(), span: DUMMY_SP, }, @@ -374,7 +373,6 @@ impl Default for Generics { /// A where-clause in a definition. #[derive(Clone, RustcEncodable, RustcDecodable, Debug)] pub struct WhereClause { - pub id: NodeId, pub predicates: Vec<WherePredicate>, pub span: Span, } diff --git a/src/libsyntax/mut_visit.rs b/src/libsyntax/mut_visit.rs index 02e2c96868d..5a5b633e315 100644 --- a/src/libsyntax/mut_visit.rs +++ b/src/libsyntax/mut_visit.rs @@ -750,8 +750,7 @@ pub fn noop_visit_generics<T: MutVisitor>(generics: &mut Generics, vis: &mut T) } pub fn noop_visit_where_clause<T: MutVisitor>(wc: &mut WhereClause, vis: &mut T) { - let WhereClause { id, predicates, span } = wc; - vis.visit_id(id); + let WhereClause { predicates, span } = wc; visit_vec(predicates, |predicate| vis.visit_where_predicate(predicate)); vis.visit_span(span); } diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 78eeb512206..fa697e06d26 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -5075,7 +5075,6 @@ impl<'a> Parser<'a> { Ok(ast::Generics { params, where_clause: WhereClause { - id: ast::DUMMY_NODE_ID, predicates: Vec::new(), span: DUMMY_SP, }, @@ -5334,7 +5333,6 @@ impl<'a> Parser<'a> { /// ``` fn parse_where_clause(&mut self) -> PResult<'a, WhereClause> { let mut where_clause = WhereClause { - id: ast::DUMMY_NODE_ID, predicates: Vec::new(), span: self.prev_span.to(self.prev_span), }; diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 4cbe590d44b..0aac4f83658 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -3042,7 +3042,6 @@ impl<'a> State<'a> { let generics = ast::Generics { params: Vec::new(), where_clause: ast::WhereClause { - id: ast::DUMMY_NODE_ID, predicates: Vec::new(), span: syntax_pos::DUMMY_SP, }, |
