From 45b5d5f9bf5c18157becbaf0374c0876fa065855 Mon Sep 17 00:00:00 2001 From: Daria Sukhonina Date: Tue, 17 Mar 2026 12:11:13 +0300 Subject: [PATCH] Small report_cycle refactor --- compiler/rustc_query_impl/src/job.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/compiler/rustc_query_impl/src/job.rs b/compiler/rustc_query_impl/src/job.rs index 0b989201a2e0..0fc129f26e7f 100644 --- a/compiler/rustc_query_impl/src/job.rs +++ b/compiler/rustc_query_impl/src/job.rs @@ -472,13 +472,10 @@ pub(crate) fn report_cycle<'tcx>( cycle_stack.push(crate::error::CycleStack { span, desc: node.tagged_key.description(tcx) }); } - let mut cycle_usage = None; - if let Some(usage) = usage { - cycle_usage = Some(crate::error::CycleUsage { - span: usage.node.tagged_key.default_span(tcx, usage.span), - usage: usage.node.tagged_key.description(tcx), - }); - } + let cycle_usage = usage.as_ref().map(|usage| crate::error::CycleUsage { + span: usage.node.tagged_key.default_span(tcx, usage.span), + usage: usage.node.tagged_key.description(tcx), + }); let alias = if stack .iter()