rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Replace unwrap_or with explicit match

Browse Source
This commit is contained in:
Ben Schulz
2025-07-24 20:41:30 +02:00
parent 6fc68c16e7
commit 307f66436b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_lint/src/unused.rs
View File

@@ -1062,7 +1062,6 @@ pub(crate) struct UnusedParens {
/// ```
/// type Example = Box<dyn Fn() -> &'static dyn Send>;
/// ```
#[derive(Copy, Clone)]
enum NoBoundsException {
/// The type must be parenthesized.
None,
@@ -1343,8 +1342,12 @@ impl EarlyLintPass for UnusedParens {
ast::TyKind::Ref(_, mut_ty) | ast::TyKind::Ptr(mut_ty) => {
// If this type itself appears in no-bounds position, we propagate its
// potentially tighter constraint or risk a false posive (issue 143653).
let own_constraint = self.in_no_bounds_pos.get(&ty.id).copied();
let constraint = own_constraint.unwrap_or(NoBoundsException::OneBound);
let own_constraint = self.in_no_bounds_pos.get(&ty.id);
let constraint = match own_constraint {
Some(NoBoundsException::None) => NoBoundsException::None,
Some(NoBoundsException::OneBound) => NoBoundsException::OneBound,
None => NoBoundsException::OneBound,
};
self.in_no_bounds_pos.insert(mut_ty.ty.id, constraint);
}
ast::TyKind::TraitObject(bounds, _) | ast::TyKind::ImplTrait(_, bounds) => {