mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use symbols when raising range expressions.

Browse Source
This commit is contained in:
Jason Newcomb 2024-06-16 14:38:58 -04:00
parent 9f5d60f160
commit f09650b347
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
clippy_utils/src/higher.rs
View File

@ -218,51 +218,56 @@ pub struct Range<'a> {
impl<'a> Range<'a> { impl<'a> Range<'a> {
/// Higher a `hir` range to something similar to `ast::ExprKind::Range`. /// Higher a `hir` range to something similar to `ast::ExprKind::Range`.
#[allow(clippy::similar_names)]
pub fn hir(expr: &'a Expr<'_>) -> Option<Range<'a>> { pub fn hir(expr: &'a Expr<'_>) -> Option<Range<'a>> {
/// Finds the field named `name` in the field. Always return `Some` for
/// convenience.
fn get_field<'c>(name: &str, fields: &'c [hir::ExprField<'_>]) -> Option<&'c Expr<'c>> {
let expr = &fields.iter().find(|field| field.ident.name.as_str() == name)?.expr;
Some(expr)
}
match expr.kind { match expr.kind {
ExprKind::Call(path, args) ExprKind::Call(path, [arg1, arg2])
if matches!( if matches!(
path.kind, path.kind,
ExprKind::Path(QPath::LangItem(hir::LangItem::RangeInclusiveNew, ..)) ExprKind::Path(QPath::LangItem(hir::LangItem::RangeInclusiveNew, ..))
) => ) =>
{ {
Some(Range { Some(Range {
start: Some(&args[0]), start: Some(arg1),
end: Some(&args[1]), end: Some(arg2),
limits: ast::RangeLimits::Closed, limits: ast::RangeLimits::Closed,
}) })
}, },
ExprKind::Struct(path, fields, None) => match &path { ExprKind::Struct(path, fields, None) => match (path, fields) {
QPath::LangItem(hir::LangItem::RangeFull, ..) => Some(Range { (QPath::LangItem(hir::LangItem::RangeFull, ..), []) => Some(Range {
start: None, start: None,
end: None, end: None,
limits: ast::RangeLimits::HalfOpen, limits: ast::RangeLimits::HalfOpen,
}), }),
QPath::LangItem(hir::LangItem::RangeFrom, ..) => Some(Range { (QPath::LangItem(hir::LangItem::RangeFrom, ..), [field]) if field.ident.name == sym::start => {
start: Some(get_field("start", fields)?), Some(Range {
end: None, start: Some(field.expr),
limits: ast::RangeLimits::HalfOpen, end: None,
}), limits: ast::RangeLimits::HalfOpen,
QPath::LangItem(hir::LangItem::Range, ..) => Some(Range { })
start: Some(get_field("start", fields)?), },
end: Some(get_field("end", fields)?), (QPath::LangItem(hir::LangItem::Range, ..), [field1, field2]) => {
limits: ast::RangeLimits::HalfOpen, let (start, end) = match (field1.ident.name, field2.ident.name) {
}), (sym::start, sym::end) => (field1.expr, field2.expr),
QPath::LangItem(hir::LangItem::RangeToInclusive, ..) => Some(Range { (sym::end, sym::start) => (field2.expr, field1.expr),
_ => return None,
};
Some(Range {
start: Some(start),
end: Some(end),
limits: ast::RangeLimits::HalfOpen,
})
},
(QPath::LangItem(hir::LangItem::RangeToInclusive, ..), [field]) if field.ident.name == sym::end => {
Some(Range {
start: None,
end: Some(field.expr),
limits: ast::RangeLimits::Closed,
})
},
(QPath::LangItem(hir::LangItem::RangeTo, ..), [field]) if field.ident.name == sym::end => Some(Range {
start: None, start: None,
end: Some(get_field("end", fields)?), end: Some(field.expr),
limits: ast::RangeLimits::Closed,
}),
QPath::LangItem(hir::LangItem::RangeTo, ..) => Some(Range {
start: None,
end: Some(get_field("end", fields)?),
limits: ast::RangeLimits::HalfOpen, limits: ast::RangeLimits::HalfOpen,
}), }),
_ => None, _ => None,