Skip to content

Commit

Permalink
Auto merge of rust-lang#17668 - Veykril:incorrect-nevers, r=Veykril
Browse files Browse the repository at this point in the history
Remove incorrect never! invocations

These can crop up when the `Future` related lang items are missing
  • Loading branch information
bors committed Jul 22, 2024
2 parents 64cb0bf + c00246f commit b349baa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/tools/rust-analyzer/crates/hir/src/display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ impl HirDisplay for Function {
.as_ref()
.unwrap()
}
_ => panic!("Async fn ret_type should be impl Future"),
_ => &TypeRef::Error,
},
_ => panic!("Async fn ret_type should be impl Future"),
_ => &TypeRef::Error,
}
};

Expand Down
1 change: 0 additions & 1 deletion src/tools/rust-analyzer/crates/hir/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,6 @@ impl Function {
return Type::new_with_resolver_inner(db, &resolver, output_eq.ty).into();
}
}
never!("Async fn ret_type should be impl Future");
None
}

Expand Down

0 comments on commit b349baa

Please sign in to comment.