diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-12-15 08:36:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-15 08:36:23 +0100 |
| commit | 6b00227666ada55524912bee808d28a7ce00deec (patch) | |
| tree | a301554718c6bbdf1771200d5607897efc7c87e7 /compiler/rustc_ast_lowering/src | |
| parent | e6c495dd5996c1c16f67869bf62fa68a210768be (diff) | |
| parent | 0a0f01410d378fc9d1ca27fe5a42f01092e0cf3e (diff) | |
| download | rust-6b00227666ada55524912bee808d28a7ce00deec.tar.gz rust-6b00227666ada55524912bee808d28a7ce00deec.zip | |
Rollup merge of #91888 - BoxyUwU:generic_arg_infer_aaaa, r=lcnr
Handle unordered const/ty generics for object lifetime defaults *feel like I should have a PR description but cant think of what to put here* r? ```@lcnr```
Diffstat (limited to 'compiler/rustc_ast_lowering/src')
| -rw-r--r-- | compiler/rustc_ast_lowering/src/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs index fee2e7636ea..0077dec889d 100644 --- a/compiler/rustc_ast_lowering/src/lib.rs +++ b/compiler/rustc_ast_lowering/src/lib.rs @@ -52,7 +52,7 @@ use rustc_hir::def::{DefKind, Namespace, PartialRes, PerNS, Res}; use rustc_hir::def_id::{DefId, DefPathHash, LocalDefId, CRATE_DEF_ID}; use rustc_hir::definitions::{DefKey, DefPathData, Definitions}; use rustc_hir::intravisit; -use rustc_hir::{ConstArg, GenericArg, InferKind, ParamName}; +use rustc_hir::{ConstArg, GenericArg, ParamName}; use rustc_index::vec::{Idx, IndexVec}; use rustc_query_system::ich::StableHashingContext; use rustc_session::lint::builtin::BARE_TRAIT_OBJECTS; @@ -1113,7 +1113,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { return GenericArg::Infer(hir::InferArg { hir_id: self.lower_node_id(ty.id), span: self.lower_span(ty.span), - kind: InferKind::Type, }); } // We parse const arguments as path types as we cannot distinguish them during |
