diff options
| author | Noah Lev <camelidcamel@gmail.com> | 2024-07-16 19:07:36 -0700 |
|---|---|---|
| committer | Noah Lev <camelidcamel@gmail.com> | 2024-07-16 19:27:28 -0700 |
| commit | f2c1265483bcedb13cdac3b34432fbff7b4acd59 (patch) | |
| tree | 6cd84ff83f2b7b0e8087a8c313f267d7d5e3f1d1 /clippy_lints/src/utils | |
| parent | 6e99e2d748353174e23bf2849f0d523d8128a201 (diff) | |
Add `ConstArgKind::Path` and make `ConstArg` its own HIR node
This is a very large commit since a lot needs to be changed in order to make the tests pass. The salient changes are: - `ConstArgKind` gets a new `Path` variant, and all const params are now represented using it. Non-param paths still use `ConstArgKind::Anon` to prevent this change from getting too large, but they will soon use the `Path` variant too. - `ConstArg` gets a distinct `hir_id` field and its own variant in `hir::Node`. This affected many parts of the compiler that expected the parent of an `AnonConst` to be the containing context (e.g., an array repeat expression). They have been changed to check the "grandparent" where necessary. - Some `ast::AnonConst`s now have their `DefId`s created in rustc_ast_lowering rather than `DefCollector`. This is because in some cases they will end up becoming a `ConstArgKind::Path` instead, which has no `DefId`. We have to solve this in a hacky way where we guess whether the `AnonConst` could end up as a path const since we can't know for sure until after name resolution (`N` could refer to a free const or a nullary struct). If it has no chance as being a const param, then we create a `DefId` in `DefCollector` -- otherwise we decide during ast_lowering. This will have to be updated once all path consts use `ConstArgKind::Path`. - We explicitly use `ConstArgHasType` for array lengths, rather than implicitly relying on anon const type feeding -- this is due to the addition of `ConstArgKind::Path`. - Some tests have their outputs changed, but the changes are for the most part minor (including removing duplicate or almost-duplicate errors). One test now ICEs, but it is for an incomplete, unstable feature and is now tracked at #127009.
Diffstat (limited to 'clippy_lints/src/utils')
| -rw-r--r-- | clippy_lints/src/utils/author.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/clippy_lints/src/utils/author.rs b/clippy_lints/src/utils/author.rs index 441144d4bd1..316c1f32d3a 100644 --- a/clippy_lints/src/utils/author.rs +++ b/clippy_lints/src/utils/author.rs @@ -271,15 +271,14 @@ impl<'a, 'tcx> PrintVisitor<'a, 'tcx> { fn const_arg(&self, const_arg: &Binding<&ConstArg<'_>>) { match const_arg.value.kind { - // FIXME: uncomment for ConstArgKind::Path - // ConstArgKind::Path(ref qpath) => { - // bind!(self, qpath); - // chain!(self, "let ConstArgKind::Path(ref {qpath}) = {const_arg}.kind"); - // self.qpath(qpath); - // }, + ConstArgKind::Path(ref qpath) => { + bind!(self, qpath); + chain!(self, "let ConstArgKind::Path(ref {qpath}) = {const_arg}.kind"); + self.qpath(qpath); + }, ConstArgKind::Anon(anon_const) => { bind!(self, anon_const); - chain!(self, "let ConstArgKind::({anon_const}) = {const_arg}.kind"); + chain!(self, "let ConstArgKind::Anon({anon_const}) = {const_arg}.kind"); self.body(field!(anon_const.body)); }, } |
