nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark some once-again-unreachable paths as unreachable.

Browse Source 
This undoes the changes from #121482 and #121586, now that stashed errors
will trigger more early aborts.
This commit is contained in:
Nicholas Nethercote 2024-02-27 15:02:54 +11:00
parent 260ae70140
commit b4e9f93eb4
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/rustc_lint/src/array_into_iter.rs
View File

@ -70,15 +70,11 @@ impl<'tcx> LateLintPass<'tcx> for ArrayIntoIter {
// Check if the method call actually calls the libcore // Check if the method call actually calls the libcore
// `IntoIterator::into_iter`. // `IntoIterator::into_iter`.
let trait_id = cx let def_id = cx.typeck_results().type_dependent_def_id(expr.hir_id).unwrap();
.typeck_results() match cx.tcx.trait_of_item(def_id) {
.type_dependent_def_id(expr.hir_id) Some(trait_id) if cx.tcx.is_diagnostic_item(sym::IntoIterator, trait_id) => {}
.and_then(|did| cx.tcx.trait_of_item(did)); _ => return,
if trait_id.is_none() };
|| !cx.tcx.is_diagnostic_item(sym::IntoIterator, trait_id.unwrap())
{
return;
}
// As this is a method call expression, we have at least one argument. // As this is a method call expression, we have at least one argument.
let receiver_ty = cx.typeck_results().expr_ty(receiver_arg); let receiver_ty = cx.typeck_results().expr_ty(receiver_arg);

5
compiler/rustc_privacy/src/lib.rs
View File

@ -988,10 +988,7 @@ impl<'tcx> Visitor<'tcx> for NamePrivacyVisitor<'tcx> {
fn visit_expr(&mut self, expr: &'tcx hir::Expr<'tcx>) { fn visit_expr(&mut self, expr: &'tcx hir::Expr<'tcx>) {
if let hir::ExprKind::Struct(qpath, fields, ref base) = expr.kind { if let hir::ExprKind::Struct(qpath, fields, ref base) = expr.kind {
let res = self.typeck_results().qpath_res(qpath, expr.hir_id); let res = self.typeck_results().qpath_res(qpath, expr.hir_id);
let Some(adt) = self.typeck_results().expr_ty(expr).ty_adt_def() else { let adt = self.typeck_results().expr_ty(expr).ty_adt_def().unwrap();
self.tcx.dcx().span_delayed_bug(expr.span, "no adt_def for expression");
return;
};
let variant = adt.variant_of_res(res); let variant = adt.variant_of_res(res);
if let Some(base) = *base { if let Some(base) = *base {
// If the expression uses FRU we need to make sure all the unmentioned fields // If the expression uses FRU we need to make sure all the unmentioned fields