Skip to content

Commit f0b2b3c

Browse files
committed
rustc: Remove a redundant lifetime parameter from ExprUseVisitor.
1 parent 12e56ea commit f0b2b3c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/librustc/middle/expr_use_visitor.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,9 @@ impl OverloadedCallType {
241241
// mem_categorization, it requires a TYPER, which is a type that
242242
// supplies types from the tree. After type checking is complete, you
243243
// can just use the tcx as the typer.
244-
pub struct ExprUseVisitor<'d, 'a, 'gcx: 'a+'tcx, 'tcx:'a+'d> {
244+
pub struct ExprUseVisitor<'a, 'gcx: 'a+'tcx, 'tcx: 'a> {
245245
mc: mc::MemCategorizationContext<'a, 'gcx, 'tcx>,
246-
delegate: &'d mut Delegate<'tcx>,
246+
delegate: &'a mut Delegate<'tcx>,
247247
}
248248

249249
// If the TYPER results in an error, it's because the type check
@@ -271,8 +271,8 @@ enum PassArgs {
271271
ByRef,
272272
}
273273

274-
impl<'d, 'a, 'tcx> ExprUseVisitor<'d, 'a, 'tcx, 'tcx> {
275-
pub fn new(delegate: &'d mut (Delegate<'tcx>+'d),
274+
impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx, 'tcx> {
275+
pub fn new(delegate: &'a mut (Delegate<'tcx>+'a),
276276
infcx: &'a InferCtxt<'a, 'tcx, 'tcx>) -> Self
277277
{
278278
ExprUseVisitor {

src/librustc_passes/consts.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ impl<'a, 'tcx> CheckCrateVisitor<'a, 'tcx> {
8787
r
8888
}
8989

90-
fn with_euv<'b, F, R>(&'b mut self, item_id: Option<ast::NodeId>, f: F) -> R where
91-
F: for<'c> FnOnce(&mut euv::ExprUseVisitor<'c, 'c, 'tcx, 'tcx>) -> R,
90+
fn with_euv<F, R>(&mut self, item_id: Option<ast::NodeId>, f: F) -> R where
91+
F: for<'b> FnOnce(&mut euv::ExprUseVisitor<'b, 'tcx, 'tcx>) -> R,
9292
{
9393
let param_env = match item_id {
9494
Some(item_id) => ty::ParameterEnvironment::for_item(self.tcx, item_id),

0 commit comments

Comments
 (0)