bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Deduplicate logic

Browse source
This commit is contained in:
Esteban Küber 2024-12-28 18:50:18 +00:00
parent 7175da59d3
commit e7ac2eabd0
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/rustc_const_eval/src/check_consts/check.rs
View file

@ -464,6 +464,12 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {
err_span, err_span,
); );
} }
fn crate_inject_span(&self) -> Option<Span> {
self.tcx.hir_crate_items(()).definitions().next().and_then(|id| {
self.tcx.crate_level_attribute_injection_span(self.tcx.local_def_id_to_hir_id(id))
})
}
} }
impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> { impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
@ -819,17 +825,11 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
feature, feature,
.. ..
}) => { }) => {
let suggestion =
tcx.hir_crate_items(()).definitions().next().and_then(|id| {
tcx.crate_level_attribute_injection_span(
tcx.local_def_id_to_hir_id(id),
)
});
self.check_op(ops::IntrinsicUnstable { self.check_op(ops::IntrinsicUnstable {
name: intrinsic.name, name: intrinsic.name,
feature, feature,
const_stable_indirect: is_const_stable, const_stable_indirect: is_const_stable,
suggestion, suggestion: self.crate_inject_span(),
}); });
} }
Some(ConstStability { level: StabilityLevel::Stable { .. }, .. }) => { Some(ConstStability { level: StabilityLevel::Stable { .. }, .. }) => {
@ -923,18 +923,12 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
// Even if the feature is enabled, we still need check_op to double-check // Even if the feature is enabled, we still need check_op to double-check
// this if the callee is not safe to expose on stable. // this if the callee is not safe to expose on stable.
if !feature_enabled || !callee_safe_to_expose_on_stable { if !feature_enabled || !callee_safe_to_expose_on_stable {
let suggestion_span =
tcx.hir_crate_items(()).definitions().next().and_then(|id| {
tcx.crate_level_attribute_injection_span(
tcx.local_def_id_to_hir_id(id),
)
});
self.check_op(ops::FnCallUnstable { self.check_op(ops::FnCallUnstable {
def_id: callee, def_id: callee,
feature, feature,
feature_enabled, feature_enabled,
safe_to_expose_on_stable: callee_safe_to_expose_on_stable, safe_to_expose_on_stable: callee_safe_to_expose_on_stable,
suggestion_span, suggestion_span: self.crate_inject_span(),
}); });
} }
} }