Skip to content

Commit 3c5048d

Browse files
committed
Report elision failures on the AST.
1 parent bfd0435 commit 3c5048d

File tree

57 files changed

+1482
-1590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1482
-1590
lines changed

compiler/rustc_ast_lowering/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1835,7 +1835,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
18351835
debug!(?self.captured_lifetimes);
18361836
let name = match res {
18371837
LifetimeRes::Param { mut param, binder } => {
1838-
debug_assert_ne!(ident.name, kw::UnderscoreLifetime);
18391838
let p_name = ParamName::Plain(ident);
18401839
if let Some(mut captured_lifetimes) = self.captured_lifetimes.take() {
18411840
if !captured_lifetimes.binders_to_ignore.contains(&binder) {

compiler/rustc_hir/src/def.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ impl<Id> Res<Id> {
713713
}
714714

715715
/// Resolution for a lifetime appearing in a type.
716-
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
716+
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
717717
pub enum LifetimeRes {
718718
/// Successfully linked the lifetime to a generic parameter.
719719
Param {

compiler/rustc_resolve/src/late.rs

+473-161
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)