mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lower spans for opaque duplicated lifetimes, const infer vars

Browse Source
This commit is contained in:
Michael Goulet 2023-12-09 00:02:34 +00:00
parent 3818fc02c4
commit 97de8fba56
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_ast_lowering/src/lib.rs
View File

@ -1678,7 +1678,7 @@ fn lower_opaque_inner(
duplicated_lifetime_node_id, duplicated_lifetime_node_id,
lifetime.ident.name, lifetime.ident.name,
DefKind::LifetimeParam, DefKind::LifetimeParam,
lifetime.ident.span, self.lower_span(lifetime.ident.span),
); );
captured_to_synthesized_mapping.insert(old_def_id, duplicated_lifetime_def_id); captured_to_synthesized_mapping.insert(old_def_id, duplicated_lifetime_def_id);
// FIXME: Instead of doing this, we could move this whole loop // FIXME: Instead of doing this, we could move this whole loop
@ -1687,7 +1687,7 @@ fn lower_opaque_inner(
synthesized_lifetime_definitions.push(( synthesized_lifetime_definitions.push((
duplicated_lifetime_node_id, duplicated_lifetime_node_id,
duplicated_lifetime_def_id, duplicated_lifetime_def_id,
lifetime.ident, self.lower_ident(lifetime.ident),
)); ));
// Now make an arg that we can use for the generic params of the opaque tykind. // Now make an arg that we can use for the generic params of the opaque tykind.
@ -2252,7 +2252,7 @@ fn lower_array_length(&mut self, c: &AnonConst) -> hir::ArrayLen {
match c.value.kind { match c.value.kind {
ExprKind::Underscore => { ExprKind::Underscore => {
if self.tcx.features().generic_arg_infer { if self.tcx.features().generic_arg_infer {
hir::ArrayLen::Infer(self.lower_node_id(c.id), c.value.span) hir::ArrayLen::Infer(self.lower_node_id(c.id), self.lower_span(c.value.span))
} else { } else {
feature_err( feature_err(
&self.tcx.sess.parse_sess, &self.tcx.sess.parse_sess,