Skip to content

Commit e87b91b

Browse files
Rollup merge of rust-lang#154931 - aerooneqq:delegation-small-cleanup, r=petrochenkov
delegation(small cleanup): remove not needed PhantomData r? @petrochenkov
2 parents 5ecc689 + 7f06f55 commit e87b91b

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

compiler/rustc_ast_lowering/src/delegation.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
//! also be emitted during HIR ty lowering.
3838
3939
use std::iter;
40-
use std::marker::PhantomData;
4140

4241
use ast::visit::Visitor;
4342
use hir::def::{DefKind, PartialRes, Res};
@@ -418,7 +417,6 @@ impl<'hir, R: ResolverAstLoweringExt<'hir>> LoweringContext<'_, 'hir, R> {
418417
resolver: this.resolver,
419418
path_id: delegation.id,
420419
self_param_id: pat_node_id,
421-
phantom: PhantomData,
422420
};
423421
self_resolver.visit_block(block);
424422
// Target expr needs to lower `self` path.
@@ -669,14 +667,13 @@ impl<'hir, R: ResolverAstLoweringExt<'hir>> LoweringContext<'_, 'hir, R> {
669667
}
670668
}
671669

672-
struct SelfResolver<'a, 'tcx, R> {
670+
struct SelfResolver<'a, R> {
673671
resolver: &'a mut R,
674672
path_id: NodeId,
675673
self_param_id: NodeId,
676-
phantom: PhantomData<&'tcx ()>,
677674
}
678675

679-
impl<'tcx, R: ResolverAstLoweringExt<'tcx>> SelfResolver<'_, 'tcx, R> {
676+
impl<'tcx, R: ResolverAstLoweringExt<'tcx>> SelfResolver<'_, R> {
680677
fn try_replace_id(&mut self, id: NodeId) {
681678
if let Some(res) = self.resolver.get_partial_res(id)
682679
&& let Some(Res::Local(sig_id)) = res.full_res()
@@ -688,7 +685,7 @@ impl<'tcx, R: ResolverAstLoweringExt<'tcx>> SelfResolver<'_, 'tcx, R> {
688685
}
689686
}
690687

691-
impl<'ast, 'a, 'tcx, R: ResolverAstLoweringExt<'tcx>> Visitor<'ast> for SelfResolver<'a, 'tcx, R> {
688+
impl<'ast, 'tcx, R: ResolverAstLoweringExt<'tcx>> Visitor<'ast> for SelfResolver<'_, R> {
692689
fn visit_id(&mut self, id: NodeId) {
693690
self.try_replace_id(id);
694691
}

0 commit comments

Comments
 (0)