diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2023-05-14 12:48:32 +0000 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2023-05-14 12:48:32 +0000 |
| commit | 343819d33f5c4f026bbd789f87b03f932f11b0cb (patch) | |
| tree | aacd1b398175e71a5363c76a1f05aed8d598a220 /compiler/rustc_resolve/src | |
| parent | bc888958c9e1fdde09791f15d3421bdc3b6d7d29 (diff) | |
| download | rust-343819d33f5c4f026bbd789f87b03f932f11b0cb.tar.gz rust-343819d33f5c4f026bbd789f87b03f932f11b0cb.zip | |
Revert "Validate resolution for SelfCtor too."
This reverts commit 83453408a0ce91b9e3d3ae6e7f117b1fd28b487d.
Diffstat (limited to 'compiler/rustc_resolve/src')
| -rw-r--r-- | compiler/rustc_resolve/src/diagnostics.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_resolve/src/ident.rs | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/compiler/rustc_resolve/src/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs index 6675b8ed59b..59eda9db97f 100644 --- a/compiler/rustc_resolve/src/diagnostics.rs +++ b/compiler/rustc_resolve/src/diagnostics.rs @@ -550,7 +550,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> { let sm = self.tcx.sess.source_map(); let def_id = match outer_res { - Res::SelfTyParam { .. } | Res::SelfCtor(_) => { + Res::SelfTyParam { .. } => { err.span_label(span, "can't use `Self` here"); return err; } diff --git a/compiler/rustc_resolve/src/ident.rs b/compiler/rustc_resolve/src/ident.rs index 755acdd81fe..f065c4ddd2e 100644 --- a/compiler/rustc_resolve/src/ident.rs +++ b/compiler/rustc_resolve/src/ident.rs @@ -1174,10 +1174,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> { return Res::Err; } } - Res::Def(DefKind::TyParam, _) - | Res::SelfTyParam { .. } - | Res::SelfTyAlias { .. } - | Res::SelfCtor(_) => { + Res::Def(DefKind::TyParam, _) | Res::SelfTyParam { .. } | Res::SelfTyAlias { .. } => { for rib in ribs { let has_generic_params: HasGenericParams = match rib.kind { RibKind::Normal |
