2016-08-23 12:39:36 -05:00
|
|
|
//! Contains utility functions to generate suggestions.
|
2018-08-01 15:48:41 -05:00
|
|
|
#![deny(clippy::missing_docs_in_private_items)]
|
2016-08-23 12:39:36 -05:00
|
|
|
|
2023-03-24 08:04:35 -05:00
|
|
|
use crate::source::{snippet, snippet_opt, snippet_with_applicability, snippet_with_context};
|
2022-07-18 02:39:37 -05:00
|
|
|
use crate::ty::expr_sig;
|
2021-12-06 05:33:31 -06:00
|
|
|
use crate::{get_parent_expr_for_hir, higher};
|
2020-02-29 21:23:33 -06:00
|
|
|
use rustc_ast::util::parser::AssocOp;
|
|
|
|
use rustc_ast::{ast, token};
|
2020-02-01 15:56:27 -06:00
|
|
|
use rustc_ast_pretty::pprust::token_kind_to_string;
|
2018-12-29 09:04:45 -06:00
|
|
|
use rustc_errors::Applicability;
|
2020-01-06 10:39:50 -06:00
|
|
|
use rustc_hir as hir;
|
2022-06-30 05:18:51 -05:00
|
|
|
use rustc_hir::{Closure, ExprKind, HirId, MutTy, TyKind};
|
2022-10-20 10:51:48 -05:00
|
|
|
use rustc_hir_typeck::expr_use_visitor::{Delegate, ExprUseVisitor, PlaceBase, PlaceWithHirId};
|
2020-01-12 00:08:41 -06:00
|
|
|
use rustc_lint::{EarlyContext, LateContext, LintContext};
|
2021-12-06 05:33:31 -06:00
|
|
|
use rustc_middle::hir::place::ProjectionKind;
|
|
|
|
use rustc_middle::mir::{FakeReadCause, Mutability};
|
|
|
|
use rustc_middle::ty;
|
2023-11-01 22:10:12 -05:00
|
|
|
use rustc_span::{BytePos, CharPos, Pos, Span, SyntaxContext};
|
2018-11-27 14:14:15 -06:00
|
|
|
use std::borrow::Cow;
|
2023-02-25 18:08:29 -06:00
|
|
|
use std::fmt::{self, Display, Write as _};
|
2020-10-23 15:16:59 -05:00
|
|
|
use std::ops::{Add, Neg, Not, Sub};
|
2016-06-29 14:23:21 -05:00
|
|
|
|
2021-10-17 05:04:01 -05:00
|
|
|
/// A helper type to build suggestion correctly handling parentheses.
|
2022-09-21 12:02:37 -05:00
|
|
|
#[derive(Clone, Debug, PartialEq)]
|
2016-06-29 14:23:21 -05:00
|
|
|
pub enum Sugg<'a> {
|
2021-10-17 05:04:01 -05:00
|
|
|
/// An expression that never needs parentheses such as `1337` or `[0; 42]`.
|
2016-06-29 14:23:21 -05:00
|
|
|
NonParen(Cow<'a, str>),
|
|
|
|
/// An expression that does not fit in other variants.
|
|
|
|
MaybeParen(Cow<'a, str>),
|
2017-08-09 02:30:56 -05:00
|
|
|
/// A binary operator expression, including `as`-casts and explicit type
|
|
|
|
/// coercion.
|
2021-12-30 08:10:43 -06:00
|
|
|
BinOp(AssocOp, Cow<'a, str>, Cow<'a, str>),
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
|
2020-10-23 15:16:59 -05:00
|
|
|
/// Literal constant `0`, for convenience.
|
|
|
|
pub const ZERO: Sugg<'static> = Sugg::NonParen(Cow::Borrowed("0"));
|
2016-07-01 12:30:38 -05:00
|
|
|
/// Literal constant `1`, for convenience.
|
|
|
|
pub const ONE: Sugg<'static> = Sugg::NonParen(Cow::Borrowed("1"));
|
2020-10-23 15:16:59 -05:00
|
|
|
/// a constant represents an empty string, for convenience.
|
|
|
|
pub const EMPTY: Sugg<'static> = Sugg::NonParen(Cow::Borrowed(""));
|
2016-07-01 12:30:38 -05:00
|
|
|
|
2018-07-23 06:01:12 -05:00
|
|
|
impl Display for Sugg<'_> {
|
2024-04-04 12:52:55 -05:00
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
|
2016-06-29 14:23:21 -05:00
|
|
|
match *self {
|
2021-12-30 08:10:43 -06:00
|
|
|
Sugg::NonParen(ref s) | Sugg::MaybeParen(ref s) => s.fmt(f),
|
|
|
|
Sugg::BinOp(op, ref lhs, ref rhs) => binop_to_string(op, lhs, rhs).fmt(f),
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-05-21 06:24:00 -05:00
|
|
|
#[expect(clippy::wrong_self_convention)] // ok, because of the function `as_ty` method
|
2016-06-29 14:23:21 -05:00
|
|
|
impl<'a> Sugg<'a> {
|
2016-08-23 12:39:36 -05:00
|
|
|
/// Prepare a suggestion from an expression.
|
2020-06-25 15:41:36 -05:00
|
|
|
pub fn hir_opt(cx: &LateContext<'_>, expr: &hir::Expr<'_>) -> Option<Self> {
|
2024-07-25 11:29:17 -05:00
|
|
|
let ctxt = expr.span.ctxt();
|
|
|
|
let get_snippet = |span| snippet_with_context(cx, span, ctxt, "", &mut Applicability::Unspecified).0;
|
2021-12-30 08:10:43 -06:00
|
|
|
snippet_opt(cx, expr.span).map(|_| Self::hir_from_snippet(expr, get_snippet))
|
2016-07-02 10:24:24 -05:00
|
|
|
}
|
2016-06-29 14:23:21 -05:00
|
|
|
|
2017-08-09 02:30:56 -05:00
|
|
|
/// Convenience function around `hir_opt` for suggestions with a default
|
|
|
|
/// text.
|
2020-06-25 15:41:36 -05:00
|
|
|
pub fn hir(cx: &LateContext<'_>, expr: &hir::Expr<'_>, default: &'a str) -> Self {
|
2020-09-24 07:49:22 -05:00
|
|
|
Self::hir_opt(cx, expr).unwrap_or(Sugg::NonParen(Cow::Borrowed(default)))
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
|
2018-11-27 08:11:13 -06:00
|
|
|
/// Same as `hir`, but it adapts the applicability level by following rules:
|
|
|
|
///
|
|
|
|
/// - Applicability level `Unspecified` will never be changed.
|
|
|
|
/// - If the span is inside a macro, change the applicability level to `MaybeIncorrect`.
|
2018-11-27 14:14:15 -06:00
|
|
|
/// - If the default value is used and the applicability level is `MachineApplicable`, change it
|
2024-05-21 12:39:30 -05:00
|
|
|
/// to `HasPlaceholders`
|
2018-11-27 08:11:13 -06:00
|
|
|
pub fn hir_with_applicability(
|
2020-06-25 15:41:36 -05:00
|
|
|
cx: &LateContext<'_>,
|
2019-12-27 01:12:26 -06:00
|
|
|
expr: &hir::Expr<'_>,
|
2018-11-27 08:11:13 -06:00
|
|
|
default: &'a str,
|
|
|
|
applicability: &mut Applicability,
|
|
|
|
) -> Self {
|
2019-08-19 11:30:32 -05:00
|
|
|
if *applicability != Applicability::Unspecified && expr.span.from_expansion() {
|
2018-11-27 08:11:13 -06:00
|
|
|
*applicability = Applicability::MaybeIncorrect;
|
|
|
|
}
|
2018-11-20 03:33:40 -06:00
|
|
|
Self::hir_opt(cx, expr).unwrap_or_else(|| {
|
|
|
|
if *applicability == Applicability::MachineApplicable {
|
|
|
|
*applicability = Applicability::HasPlaceholders;
|
|
|
|
}
|
|
|
|
Sugg::NonParen(Cow::Borrowed(default))
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2021-06-03 01:41:37 -05:00
|
|
|
/// Same as `hir`, but first walks the span up to the given context. This will result in the
|
2023-09-12 11:13:53 -05:00
|
|
|
/// macro call, rather than the expansion, if the span is from a child context. If the span is
|
2021-06-03 01:41:37 -05:00
|
|
|
/// not from a child context, it will be used directly instead.
|
|
|
|
///
|
|
|
|
/// e.g. Given the expression `&vec![]`, getting a snippet from the span for `vec![]` as a HIR
|
|
|
|
/// node would result in `box []`. If given the context of the address of expression, this
|
|
|
|
/// function will correctly get a snippet of `vec![]`.
|
|
|
|
pub fn hir_with_context(
|
|
|
|
cx: &LateContext<'_>,
|
|
|
|
expr: &hir::Expr<'_>,
|
|
|
|
ctxt: SyntaxContext,
|
|
|
|
default: &'a str,
|
|
|
|
applicability: &mut Applicability,
|
|
|
|
) -> Self {
|
2021-12-30 08:10:43 -06:00
|
|
|
if expr.span.ctxt() == ctxt {
|
2024-07-25 11:29:17 -05:00
|
|
|
Self::hir_from_snippet(expr, |span| {
|
|
|
|
snippet_with_context(cx, span, ctxt, default, applicability).0
|
|
|
|
})
|
2021-06-03 01:41:37 -05:00
|
|
|
} else {
|
2022-10-23 08:18:45 -05:00
|
|
|
let (snip, _) = snippet_with_context(cx, expr.span, ctxt, default, applicability);
|
2021-12-30 08:10:43 -06:00
|
|
|
Sugg::NonParen(snip)
|
2021-06-03 01:41:37 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-16 15:52:20 -06:00
|
|
|
/// Generate a suggestion for an expression with the given snippet. This is used by the `hir_*`
|
|
|
|
/// function variants of `Sugg`, since these use different snippet functions.
|
2024-07-25 11:29:17 -05:00
|
|
|
fn hir_from_snippet(expr: &hir::Expr<'_>, mut get_snippet: impl FnMut(Span) -> Cow<'a, str>) -> Self {
|
2021-08-08 09:49:13 -05:00
|
|
|
if let Some(range) = higher::Range::hir(expr) {
|
2019-10-18 11:11:15 -05:00
|
|
|
let op = match range.limits {
|
|
|
|
ast::RangeLimits::HalfOpen => AssocOp::DotDot,
|
|
|
|
ast::RangeLimits::Closed => AssocOp::DotDotEq,
|
|
|
|
};
|
2021-12-30 08:10:43 -06:00
|
|
|
let start = range.start.map_or("".into(), |expr| get_snippet(expr.span));
|
|
|
|
let end = range.end.map_or("".into(), |expr| get_snippet(expr.span));
|
|
|
|
|
|
|
|
return Sugg::BinOp(op, start, end);
|
2019-10-18 11:11:15 -05:00
|
|
|
}
|
|
|
|
|
2019-09-27 10:16:06 -05:00
|
|
|
match expr.kind {
|
2024-04-04 12:52:55 -05:00
|
|
|
ExprKind::AddrOf(..)
|
|
|
|
| ExprKind::If(..)
|
|
|
|
| ExprKind::Let(..)
|
|
|
|
| ExprKind::Closure { .. }
|
|
|
|
| ExprKind::Unary(..)
|
|
|
|
| ExprKind::Match(..) => Sugg::MaybeParen(get_snippet(expr.span)),
|
|
|
|
ExprKind::Continue(..)
|
|
|
|
| ExprKind::Yield(..)
|
|
|
|
| ExprKind::Array(..)
|
|
|
|
| ExprKind::Block(..)
|
|
|
|
| ExprKind::Break(..)
|
|
|
|
| ExprKind::Call(..)
|
|
|
|
| ExprKind::Field(..)
|
|
|
|
| ExprKind::Index(..)
|
|
|
|
| ExprKind::InlineAsm(..)
|
|
|
|
| ExprKind::OffsetOf(..)
|
|
|
|
| ExprKind::ConstBlock(..)
|
|
|
|
| ExprKind::Lit(..)
|
|
|
|
| ExprKind::Loop(..)
|
|
|
|
| ExprKind::MethodCall(..)
|
|
|
|
| ExprKind::Path(..)
|
|
|
|
| ExprKind::Repeat(..)
|
|
|
|
| ExprKind::Ret(..)
|
|
|
|
| ExprKind::Become(..)
|
|
|
|
| ExprKind::Struct(..)
|
|
|
|
| ExprKind::Tup(..)
|
|
|
|
| ExprKind::Err(_) => Sugg::NonParen(get_snippet(expr.span)),
|
|
|
|
ExprKind::DropTemps(inner) => Self::hir_from_snippet(inner, get_snippet),
|
|
|
|
ExprKind::Assign(lhs, rhs, _) => {
|
2021-12-30 08:10:43 -06:00
|
|
|
Sugg::BinOp(AssocOp::Assign, get_snippet(lhs.span), get_snippet(rhs.span))
|
|
|
|
},
|
2024-04-04 12:52:55 -05:00
|
|
|
ExprKind::AssignOp(op, lhs, rhs) => {
|
2021-12-30 08:10:43 -06:00
|
|
|
Sugg::BinOp(hirbinop2assignop(op), get_snippet(lhs.span), get_snippet(rhs.span))
|
|
|
|
},
|
2024-04-04 12:52:55 -05:00
|
|
|
ExprKind::Binary(op, lhs, rhs) => Sugg::BinOp(
|
2023-12-01 11:21:58 -06:00
|
|
|
AssocOp::from_ast_binop(op.node),
|
2021-12-30 08:10:43 -06:00
|
|
|
get_snippet(lhs.span),
|
|
|
|
get_snippet(rhs.span),
|
|
|
|
),
|
2024-04-04 12:52:55 -05:00
|
|
|
ExprKind::Cast(lhs, ty) |
|
2023-03-14 11:23:34 -05:00
|
|
|
//FIXME(chenyukang), remove this after type ascription is removed from AST
|
2024-04-04 12:52:55 -05:00
|
|
|
ExprKind::Type(lhs, ty) => Sugg::BinOp(AssocOp::As, get_snippet(lhs.span), get_snippet(ty.span)),
|
2019-02-16 12:34:51 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-23 12:39:36 -05:00
|
|
|
/// Prepare a suggestion from an expression.
|
2022-12-01 11:29:38 -06:00
|
|
|
pub fn ast(
|
|
|
|
cx: &EarlyContext<'_>,
|
|
|
|
expr: &ast::Expr,
|
|
|
|
default: &'a str,
|
|
|
|
ctxt: SyntaxContext,
|
|
|
|
app: &mut Applicability,
|
|
|
|
) -> Self {
|
2020-02-29 21:23:33 -06:00
|
|
|
use rustc_ast::ast::RangeLimits;
|
2016-06-29 14:23:21 -05:00
|
|
|
|
2024-09-24 04:58:04 -05:00
|
|
|
let mut snippet = |span: Span| snippet_with_context(cx, span, ctxt, default, app).0;
|
|
|
|
|
2019-09-27 10:16:06 -05:00
|
|
|
match expr.kind {
|
2024-09-24 04:58:04 -05:00
|
|
|
_ if expr.span.ctxt() != ctxt => Sugg::NonParen(snippet(expr.span)),
|
2018-11-27 14:14:15 -06:00
|
|
|
ast::ExprKind::AddrOf(..)
|
2022-06-11 14:25:25 -05:00
|
|
|
| ast::ExprKind::Closure { .. }
|
2018-11-27 14:14:15 -06:00
|
|
|
| ast::ExprKind::If(..)
|
2019-05-21 00:43:43 -05:00
|
|
|
| ast::ExprKind::Let(..)
|
2018-11-27 14:14:15 -06:00
|
|
|
| ast::ExprKind::Unary(..)
|
2022-12-01 11:29:38 -06:00
|
|
|
| ast::ExprKind::Match(..) => match snippet_with_context(cx, expr.span, ctxt, default, app) {
|
|
|
|
(snip, false) => Sugg::MaybeParen(snip),
|
|
|
|
(snip, true) => Sugg::NonParen(snip),
|
|
|
|
},
|
2023-10-20 16:26:57 -05:00
|
|
|
ast::ExprKind::Gen(..)
|
2018-11-27 14:14:15 -06:00
|
|
|
| ast::ExprKind::Block(..)
|
|
|
|
| ast::ExprKind::Break(..)
|
|
|
|
| ast::ExprKind::Call(..)
|
|
|
|
| ast::ExprKind::Continue(..)
|
|
|
|
| ast::ExprKind::Yield(..)
|
|
|
|
| ast::ExprKind::Field(..)
|
2023-12-08 16:51:50 -06:00
|
|
|
| ast::ExprKind::ForLoop { .. }
|
2018-11-27 14:14:15 -06:00
|
|
|
| ast::ExprKind::Index(..)
|
2020-05-06 09:03:53 -05:00
|
|
|
| ast::ExprKind::InlineAsm(..)
|
2022-09-11 02:37:49 -05:00
|
|
|
| ast::ExprKind::OffsetOf(..)
|
2020-10-06 16:51:31 -05:00
|
|
|
| ast::ExprKind::ConstBlock(..)
|
2018-11-27 14:14:15 -06:00
|
|
|
| ast::ExprKind::Lit(..)
|
2022-10-31 13:30:09 -05:00
|
|
|
| ast::ExprKind::IncludedBytes(..)
|
2018-11-27 14:14:15 -06:00
|
|
|
| ast::ExprKind::Loop(..)
|
2020-03-15 12:23:43 -05:00
|
|
|
| ast::ExprKind::MacCall(..)
|
2018-11-27 14:14:15 -06:00
|
|
|
| ast::ExprKind::MethodCall(..)
|
|
|
|
| ast::ExprKind::Paren(..)
|
2020-11-11 07:15:15 -06:00
|
|
|
| ast::ExprKind::Underscore
|
2018-11-27 14:14:15 -06:00
|
|
|
| ast::ExprKind::Path(..)
|
|
|
|
| ast::ExprKind::Repeat(..)
|
|
|
|
| ast::ExprKind::Ret(..)
|
2023-06-19 07:22:02 -05:00
|
|
|
| ast::ExprKind::Become(..)
|
2022-04-24 21:08:23 -05:00
|
|
|
| ast::ExprKind::Yeet(..)
|
2023-01-11 14:42:08 -06:00
|
|
|
| ast::ExprKind::FormatArgs(..)
|
2018-11-27 14:14:15 -06:00
|
|
|
| ast::ExprKind::Struct(..)
|
|
|
|
| ast::ExprKind::Try(..)
|
|
|
|
| ast::ExprKind::TryBlock(..)
|
|
|
|
| ast::ExprKind::Tup(..)
|
|
|
|
| ast::ExprKind::Array(..)
|
|
|
|
| ast::ExprKind::While(..)
|
2019-05-07 23:58:37 -05:00
|
|
|
| ast::ExprKind::Await(..)
|
2024-02-25 15:22:11 -06:00
|
|
|
| ast::ExprKind::Err(_)
|
2024-09-24 04:58:04 -05:00
|
|
|
| ast::ExprKind::Dummy => Sugg::NonParen(snippet(expr.span)),
|
2021-12-30 08:10:43 -06:00
|
|
|
ast::ExprKind::Range(ref lhs, ref rhs, RangeLimits::HalfOpen) => Sugg::BinOp(
|
|
|
|
AssocOp::DotDot,
|
2024-09-24 04:58:04 -05:00
|
|
|
lhs.as_ref().map_or("".into(), |lhs| snippet(lhs.span)),
|
|
|
|
rhs.as_ref().map_or("".into(), |rhs| snippet(rhs.span)),
|
2021-12-30 08:10:43 -06:00
|
|
|
),
|
|
|
|
ast::ExprKind::Range(ref lhs, ref rhs, RangeLimits::Closed) => Sugg::BinOp(
|
|
|
|
AssocOp::DotDotEq,
|
2024-09-24 04:58:04 -05:00
|
|
|
lhs.as_ref().map_or("".into(), |lhs| snippet(lhs.span)),
|
|
|
|
rhs.as_ref().map_or("".into(), |rhs| snippet(rhs.span)),
|
2021-12-30 08:10:43 -06:00
|
|
|
),
|
|
|
|
ast::ExprKind::Assign(ref lhs, ref rhs, _) => Sugg::BinOp(
|
|
|
|
AssocOp::Assign,
|
2024-09-24 04:58:04 -05:00
|
|
|
snippet(lhs.span),
|
|
|
|
snippet(rhs.span),
|
2021-12-30 08:10:43 -06:00
|
|
|
),
|
|
|
|
ast::ExprKind::AssignOp(op, ref lhs, ref rhs) => Sugg::BinOp(
|
|
|
|
astbinop2assignop(op),
|
2024-09-24 04:58:04 -05:00
|
|
|
snippet(lhs.span),
|
|
|
|
snippet(rhs.span),
|
2021-12-30 08:10:43 -06:00
|
|
|
),
|
|
|
|
ast::ExprKind::Binary(op, ref lhs, ref rhs) => Sugg::BinOp(
|
|
|
|
AssocOp::from_ast_binop(op.node),
|
2024-09-24 04:58:04 -05:00
|
|
|
snippet(lhs.span),
|
|
|
|
snippet(rhs.span),
|
2021-12-30 08:10:43 -06:00
|
|
|
),
|
2023-05-05 10:45:49 -05:00
|
|
|
ast::ExprKind::Cast(ref lhs, ref ty) |
|
2023-03-14 11:23:34 -05:00
|
|
|
//FIXME(chenyukang), remove this after type ascription is removed from AST
|
2021-12-30 08:10:43 -06:00
|
|
|
ast::ExprKind::Type(ref lhs, ref ty) => Sugg::BinOp(
|
2023-03-14 11:23:34 -05:00
|
|
|
AssocOp::As,
|
2024-09-24 04:58:04 -05:00
|
|
|
snippet(lhs.span),
|
|
|
|
snippet(ty.span),
|
2021-12-30 08:10:43 -06:00
|
|
|
),
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-01 12:30:38 -05:00
|
|
|
/// Convenience method to create the `<lhs> && <rhs>` suggestion.
|
2017-11-03 03:56:17 -05:00
|
|
|
pub fn and(self, rhs: &Self) -> Sugg<'static> {
|
|
|
|
make_binop(ast::BinOpKind::And, &self, rhs)
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
2016-06-29 15:37:10 -05:00
|
|
|
|
2018-12-17 12:32:24 -06:00
|
|
|
/// Convenience method to create the `<lhs> & <rhs>` suggestion.
|
|
|
|
pub fn bit_and(self, rhs: &Self) -> Sugg<'static> {
|
|
|
|
make_binop(ast::BinOpKind::BitAnd, &self, rhs)
|
|
|
|
}
|
|
|
|
|
2016-07-03 19:22:57 -05:00
|
|
|
/// Convenience method to create the `<lhs> as <rhs>` suggestion.
|
2016-07-10 07:07:13 -05:00
|
|
|
pub fn as_ty<R: Display>(self, rhs: R) -> Sugg<'static> {
|
2016-07-06 08:36:42 -05:00
|
|
|
make_assoc(AssocOp::As, &self, &Sugg::NonParen(rhs.to_string().into()))
|
2016-07-03 19:22:57 -05:00
|
|
|
}
|
|
|
|
|
2016-06-29 15:37:10 -05:00
|
|
|
/// Convenience method to create the `&<expr>` suggestion.
|
2016-07-01 12:30:38 -05:00
|
|
|
pub fn addr(self) -> Sugg<'static> {
|
2016-07-01 13:55:45 -05:00
|
|
|
make_unop("&", self)
|
2016-07-01 12:30:38 -05:00
|
|
|
}
|
|
|
|
|
2016-07-02 10:24:24 -05:00
|
|
|
/// Convenience method to create the `&mut <expr>` suggestion.
|
|
|
|
pub fn mut_addr(self) -> Sugg<'static> {
|
|
|
|
make_unop("&mut ", self)
|
|
|
|
}
|
|
|
|
|
2016-07-03 12:13:01 -05:00
|
|
|
/// Convenience method to create the `*<expr>` suggestion.
|
|
|
|
pub fn deref(self) -> Sugg<'static> {
|
|
|
|
make_unop("*", self)
|
|
|
|
}
|
|
|
|
|
2018-04-11 04:17:59 -05:00
|
|
|
/// Convenience method to create the `&*<expr>` suggestion. Currently this
|
|
|
|
/// is needed because `sugg.deref().addr()` produces an unnecessary set of
|
|
|
|
/// parentheses around the deref.
|
|
|
|
pub fn addr_deref(self) -> Sugg<'static> {
|
|
|
|
make_unop("&*", self)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Convenience method to create the `&mut *<expr>` suggestion. Currently
|
|
|
|
/// this is needed because `sugg.deref().mut_addr()` produces an unnecessary
|
|
|
|
/// set of parentheses around the deref.
|
|
|
|
pub fn mut_addr_deref(self) -> Sugg<'static> {
|
|
|
|
make_unop("&mut *", self)
|
|
|
|
}
|
|
|
|
|
2019-01-22 05:33:47 -06:00
|
|
|
/// Convenience method to transform suggestion into a return call
|
|
|
|
pub fn make_return(self) -> Sugg<'static> {
|
2022-10-06 02:44:38 -05:00
|
|
|
Sugg::NonParen(Cow::Owned(format!("return {self}")))
|
2019-01-22 05:33:47 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Convenience method to transform suggestion into a block
|
|
|
|
/// where the suggestion is a trailing expression
|
|
|
|
pub fn blockify(self) -> Sugg<'static> {
|
2022-10-06 02:44:38 -05:00
|
|
|
Sugg::NonParen(Cow::Owned(format!("{{ {self} }}")))
|
2019-01-22 05:33:47 -06:00
|
|
|
}
|
|
|
|
|
2022-08-11 12:42:16 -05:00
|
|
|
/// Convenience method to prefix the expression with the `async` keyword.
|
|
|
|
/// Can be used after `blockify` to create an async block.
|
|
|
|
pub fn asyncify(self) -> Sugg<'static> {
|
2022-10-06 02:44:38 -05:00
|
|
|
Sugg::NonParen(Cow::Owned(format!("async {self}")))
|
2022-08-11 12:42:16 -05:00
|
|
|
}
|
|
|
|
|
2018-08-29 07:46:03 -05:00
|
|
|
/// Convenience method to create the `<lhs>..<rhs>` or `<lhs>...<rhs>`
|
|
|
|
/// suggestion.
|
|
|
|
pub fn range(self, end: &Self, limit: ast::RangeLimits) -> Sugg<'static> {
|
|
|
|
match limit {
|
|
|
|
ast::RangeLimits::HalfOpen => make_assoc(AssocOp::DotDot, &self, end),
|
|
|
|
ast::RangeLimits::Closed => make_assoc(AssocOp::DotDotEq, &self, end),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-17 05:04:01 -05:00
|
|
|
/// Adds parentheses to any expression that might need them. Suitable to the
|
2019-03-10 12:19:47 -05:00
|
|
|
/// `self` argument of a method call
|
|
|
|
/// (e.g., to build `bar.foo()` or `(1 + 2).foo()`).
|
2021-12-17 06:40:22 -06:00
|
|
|
#[must_use]
|
2016-07-01 13:55:45 -05:00
|
|
|
pub fn maybe_par(self) -> Self {
|
|
|
|
match self {
|
|
|
|
Sugg::NonParen(..) => self,
|
2019-03-10 12:19:47 -05:00
|
|
|
// `(x)` and `(x).y()` both don't need additional parens.
|
2018-11-27 14:14:15 -06:00
|
|
|
Sugg::MaybeParen(sugg) => {
|
2021-04-08 10:50:13 -05:00
|
|
|
if has_enclosing_paren(&sugg) {
|
2018-11-27 14:14:15 -06:00
|
|
|
Sugg::MaybeParen(sugg)
|
|
|
|
} else {
|
2022-10-06 02:44:38 -05:00
|
|
|
Sugg::NonParen(format!("({sugg})").into())
|
2018-11-27 14:14:15 -06:00
|
|
|
}
|
2016-08-08 09:43:45 -05:00
|
|
|
},
|
2021-12-30 08:10:43 -06:00
|
|
|
Sugg::BinOp(op, lhs, rhs) => {
|
|
|
|
let sugg = binop_to_string(op, &lhs, &rhs);
|
2022-10-06 02:44:38 -05:00
|
|
|
Sugg::NonParen(format!("({sugg})").into())
|
2021-04-08 10:50:13 -05:00
|
|
|
},
|
2016-07-01 13:55:45 -05:00
|
|
|
}
|
|
|
|
}
|
2024-04-04 12:52:55 -05:00
|
|
|
|
|
|
|
pub fn into_string(self) -> String {
|
|
|
|
match self {
|
|
|
|
Sugg::NonParen(p) | Sugg::MaybeParen(p) => p.into_owned(),
|
|
|
|
Sugg::BinOp(b, l, r) => binop_to_string(b, &l, &r),
|
|
|
|
}
|
|
|
|
}
|
2016-07-01 12:30:38 -05:00
|
|
|
}
|
|
|
|
|
2021-12-30 08:10:43 -06:00
|
|
|
/// Generates a string from the operator and both sides.
|
|
|
|
fn binop_to_string(op: AssocOp, lhs: &str, rhs: &str) -> String {
|
|
|
|
match op {
|
|
|
|
AssocOp::Add
|
|
|
|
| AssocOp::Subtract
|
|
|
|
| AssocOp::Multiply
|
|
|
|
| AssocOp::Divide
|
|
|
|
| AssocOp::Modulus
|
|
|
|
| AssocOp::LAnd
|
|
|
|
| AssocOp::LOr
|
|
|
|
| AssocOp::BitXor
|
|
|
|
| AssocOp::BitAnd
|
|
|
|
| AssocOp::BitOr
|
|
|
|
| AssocOp::ShiftLeft
|
|
|
|
| AssocOp::ShiftRight
|
|
|
|
| AssocOp::Equal
|
|
|
|
| AssocOp::Less
|
|
|
|
| AssocOp::LessEqual
|
|
|
|
| AssocOp::NotEqual
|
|
|
|
| AssocOp::Greater
|
2022-09-01 04:43:35 -05:00
|
|
|
| AssocOp::GreaterEqual => {
|
2023-12-01 11:21:58 -06:00
|
|
|
format!("{lhs} {} {rhs}", op.to_ast_binop().expect("Those are AST ops").as_str())
|
2022-09-01 04:43:35 -05:00
|
|
|
},
|
2022-10-06 02:44:38 -05:00
|
|
|
AssocOp::Assign => format!("{lhs} = {rhs}"),
|
2021-12-30 08:10:43 -06:00
|
|
|
AssocOp::AssignOp(op) => {
|
2022-10-06 02:44:38 -05:00
|
|
|
format!("{lhs} {}= {rhs}", token_kind_to_string(&token::BinOp(op)))
|
2021-12-30 08:10:43 -06:00
|
|
|
},
|
2022-10-06 02:44:38 -05:00
|
|
|
AssocOp::As => format!("{lhs} as {rhs}"),
|
|
|
|
AssocOp::DotDot => format!("{lhs}..{rhs}"),
|
|
|
|
AssocOp::DotDotEq => format!("{lhs}..={rhs}"),
|
2021-12-30 08:10:43 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-17 03:19:29 -05:00
|
|
|
/// Returns `true` if `sugg` is enclosed in parenthesis.
|
2022-01-27 08:12:45 -06:00
|
|
|
pub fn has_enclosing_paren(sugg: impl AsRef<str>) -> bool {
|
2021-04-08 10:50:13 -05:00
|
|
|
let mut chars = sugg.as_ref().chars();
|
2021-10-07 04:21:30 -05:00
|
|
|
if chars.next() == Some('(') {
|
2021-04-08 10:50:13 -05:00
|
|
|
let mut depth = 1;
|
2021-05-20 05:30:31 -05:00
|
|
|
for c in &mut chars {
|
2021-04-08 10:50:13 -05:00
|
|
|
if c == '(' {
|
|
|
|
depth += 1;
|
|
|
|
} else if c == ')' {
|
|
|
|
depth -= 1;
|
|
|
|
}
|
|
|
|
if depth == 0 {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
chars.next().is_none()
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-08 09:31:47 -05:00
|
|
|
/// Copied from the rust standard library, and then edited
|
2020-10-23 15:16:59 -05:00
|
|
|
macro_rules! forward_binop_impls_to_ref {
|
|
|
|
(impl $imp:ident, $method:ident for $t:ty, type Output = $o:ty) => {
|
|
|
|
impl $imp<$t> for &$t {
|
|
|
|
type Output = $o;
|
|
|
|
|
|
|
|
fn $method(self, other: $t) -> $o {
|
|
|
|
$imp::$method(self, &other)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl $imp<&$t> for $t {
|
|
|
|
type Output = $o;
|
|
|
|
|
|
|
|
fn $method(self, other: &$t) -> $o {
|
|
|
|
$imp::$method(&self, other)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl $imp for $t {
|
|
|
|
type Output = $o;
|
|
|
|
|
|
|
|
fn $method(self, other: $t) -> $o {
|
|
|
|
$imp::$method(&self, &other)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Add for &Sugg<'_> {
|
2016-07-01 12:30:38 -05:00
|
|
|
type Output = Sugg<'static>;
|
2020-10-23 15:16:59 -05:00
|
|
|
fn add(self, rhs: &Sugg<'_>) -> Sugg<'static> {
|
|
|
|
make_binop(ast::BinOpKind::Add, self, rhs)
|
2016-06-29 15:37:10 -05:00
|
|
|
}
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
|
2020-10-23 15:16:59 -05:00
|
|
|
impl Sub for &Sugg<'_> {
|
|
|
|
type Output = Sugg<'static>;
|
|
|
|
fn sub(self, rhs: &Sugg<'_>) -> Sugg<'static> {
|
|
|
|
make_binop(ast::BinOpKind::Sub, self, rhs)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
forward_binop_impls_to_ref!(impl Add, add for Sugg<'_>, type Output = Sugg<'static>);
|
|
|
|
forward_binop_impls_to_ref!(impl Sub, sub for Sugg<'_>, type Output = Sugg<'static>);
|
|
|
|
|
|
|
|
impl Neg for Sugg<'_> {
|
2016-06-29 14:23:21 -05:00
|
|
|
type Output = Sugg<'static>;
|
2020-10-23 15:16:59 -05:00
|
|
|
fn neg(self) -> Sugg<'static> {
|
2023-11-02 11:35:56 -05:00
|
|
|
match &self {
|
|
|
|
Self::BinOp(AssocOp::As, ..) => Sugg::MaybeParen(format!("-({self})").into()),
|
|
|
|
_ => make_unop("-", self),
|
|
|
|
}
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-13 06:18:19 -06:00
|
|
|
impl<'a> Not for Sugg<'a> {
|
2021-12-30 08:10:43 -06:00
|
|
|
type Output = Sugg<'a>;
|
|
|
|
fn not(self) -> Sugg<'a> {
|
|
|
|
use AssocOp::{Equal, Greater, GreaterEqual, Less, LessEqual, NotEqual};
|
|
|
|
|
|
|
|
if let Sugg::BinOp(op, lhs, rhs) = self {
|
|
|
|
let to_op = match op {
|
|
|
|
Equal => NotEqual,
|
|
|
|
NotEqual => Equal,
|
|
|
|
Less => GreaterEqual,
|
|
|
|
GreaterEqual => Less,
|
|
|
|
Greater => LessEqual,
|
|
|
|
LessEqual => Greater,
|
|
|
|
_ => return make_unop("!", Sugg::BinOp(op, lhs, rhs)),
|
|
|
|
};
|
|
|
|
Sugg::BinOp(to_op, lhs, rhs)
|
|
|
|
} else {
|
|
|
|
make_unop("!", self)
|
|
|
|
}
|
2016-06-29 14:50:21 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-23 12:39:36 -05:00
|
|
|
/// Helper type to display either `foo` or `(foo)`.
|
2016-06-29 14:23:21 -05:00
|
|
|
struct ParenHelper<T> {
|
2019-03-10 12:19:47 -05:00
|
|
|
/// `true` if parentheses are needed.
|
2016-06-29 14:23:21 -05:00
|
|
|
paren: bool,
|
2016-08-23 12:39:36 -05:00
|
|
|
/// The main thing to display.
|
2016-06-29 14:23:21 -05:00
|
|
|
wrapped: T,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> ParenHelper<T> {
|
2019-01-30 19:15:29 -06:00
|
|
|
/// Builds a `ParenHelper`.
|
2016-06-29 14:23:21 -05:00
|
|
|
fn new(paren: bool, wrapped: T) -> Self {
|
2018-11-27 14:14:15 -06:00
|
|
|
Self { paren, wrapped }
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-10 07:07:13 -05:00
|
|
|
impl<T: Display> Display for ParenHelper<T> {
|
2024-04-04 12:52:55 -05:00
|
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
|
2016-06-29 14:23:21 -05:00
|
|
|
if self.paren {
|
|
|
|
write!(f, "({})", self.wrapped)
|
|
|
|
} else {
|
|
|
|
self.wrapped.fmt(f)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-30 19:15:29 -06:00
|
|
|
/// Builds the string for `<op><expr>` adding parenthesis when necessary.
|
2016-06-29 14:50:21 -05:00
|
|
|
///
|
2017-08-09 02:30:56 -05:00
|
|
|
/// For convenience, the operator is taken as a string because all unary
|
|
|
|
/// operators have the same
|
2016-06-29 14:50:21 -05:00
|
|
|
/// precedence.
|
2018-07-23 06:01:12 -05:00
|
|
|
pub fn make_unop(op: &str, expr: Sugg<'_>) -> Sugg<'static> {
|
2022-10-06 02:44:38 -05:00
|
|
|
Sugg::MaybeParen(format!("{op}{}", expr.maybe_par()).into())
|
2016-06-29 14:50:21 -05:00
|
|
|
}
|
|
|
|
|
2019-01-30 19:15:29 -06:00
|
|
|
/// Builds the string for `<lhs> <op> <rhs>` adding parenthesis when necessary.
|
2016-06-29 14:23:21 -05:00
|
|
|
///
|
2017-08-09 02:30:56 -05:00
|
|
|
/// Precedence of shift operator relative to other arithmetic operation is
|
|
|
|
/// often confusing so
|
2016-06-29 14:23:21 -05:00
|
|
|
/// parenthesis will always be added for a mix of these.
|
2018-07-23 06:01:12 -05:00
|
|
|
pub fn make_assoc(op: AssocOp, lhs: &Sugg<'_>, rhs: &Sugg<'_>) -> Sugg<'static> {
|
2019-03-10 12:19:47 -05:00
|
|
|
/// Returns `true` if the operator is a shift operator `<<` or `>>`.
|
2020-07-14 07:59:59 -05:00
|
|
|
fn is_shift(op: AssocOp) -> bool {
|
|
|
|
matches!(op, AssocOp::ShiftLeft | AssocOp::ShiftRight)
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
|
2021-08-22 07:46:15 -05:00
|
|
|
/// Returns `true` if the operator is an arithmetic operator
|
2019-03-10 12:19:47 -05:00
|
|
|
/// (i.e., `+`, `-`, `*`, `/`, `%`).
|
2020-07-14 07:59:59 -05:00
|
|
|
fn is_arith(op: AssocOp) -> bool {
|
2017-08-09 02:30:56 -05:00
|
|
|
matches!(
|
2020-07-14 07:59:59 -05:00
|
|
|
op,
|
2017-08-09 02:30:56 -05:00
|
|
|
AssocOp::Add | AssocOp::Subtract | AssocOp::Multiply | AssocOp::Divide | AssocOp::Modulus
|
|
|
|
)
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
|
2019-03-10 12:19:47 -05:00
|
|
|
/// Returns `true` if the operator `op` needs parenthesis with the operator
|
|
|
|
/// `other` in the direction `dir`.
|
2020-07-14 07:59:59 -05:00
|
|
|
fn needs_paren(op: AssocOp, other: AssocOp, dir: Associativity) -> bool {
|
2017-11-04 14:55:56 -05:00
|
|
|
other.precedence() < op.precedence()
|
|
|
|
|| (other.precedence() == op.precedence()
|
|
|
|
&& ((op != other && associativity(op) != dir)
|
|
|
|
|| (op == other && associativity(op) != Associativity::Both)))
|
2018-11-27 14:14:15 -06:00
|
|
|
|| is_shift(op) && is_arith(other)
|
|
|
|
|| is_shift(other) && is_arith(op)
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
|
2021-12-30 08:10:43 -06:00
|
|
|
let lhs_paren = if let Sugg::BinOp(lop, _, _) = *lhs {
|
2020-07-14 07:59:59 -05:00
|
|
|
needs_paren(op, lop, Associativity::Left)
|
2016-06-29 14:23:21 -05:00
|
|
|
} else {
|
|
|
|
false
|
|
|
|
};
|
|
|
|
|
2021-12-30 08:10:43 -06:00
|
|
|
let rhs_paren = if let Sugg::BinOp(rop, _, _) = *rhs {
|
2020-07-14 07:59:59 -05:00
|
|
|
needs_paren(op, rop, Associativity::Right)
|
2016-06-29 14:23:21 -05:00
|
|
|
} else {
|
|
|
|
false
|
|
|
|
};
|
|
|
|
|
2021-12-30 08:10:43 -06:00
|
|
|
let lhs = ParenHelper::new(lhs_paren, lhs).to_string();
|
|
|
|
let rhs = ParenHelper::new(rhs_paren, rhs).to_string();
|
|
|
|
Sugg::BinOp(op, lhs.into(), rhs.into())
|
2016-07-01 12:30:38 -05:00
|
|
|
}
|
|
|
|
|
2018-07-25 13:02:52 -05:00
|
|
|
/// Convenience wrapper around `make_assoc` and `AssocOp::from_ast_binop`.
|
2018-07-23 06:01:12 -05:00
|
|
|
pub fn make_binop(op: ast::BinOpKind, lhs: &Sugg<'_>, rhs: &Sugg<'_>) -> Sugg<'static> {
|
2016-07-01 12:30:38 -05:00
|
|
|
make_assoc(AssocOp::from_ast_binop(op), lhs, rhs)
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
|
2017-02-19 21:50:31 -06:00
|
|
|
#[derive(PartialEq, Eq, Clone, Copy)]
|
2016-08-23 12:39:36 -05:00
|
|
|
/// Operator associativity.
|
2016-06-29 14:23:21 -05:00
|
|
|
enum Associativity {
|
2016-08-23 12:39:36 -05:00
|
|
|
/// The operator is both left-associative and right-associative.
|
2016-06-29 14:23:21 -05:00
|
|
|
Both,
|
2016-08-23 12:39:36 -05:00
|
|
|
/// The operator is left-associative.
|
2016-06-29 14:23:21 -05:00
|
|
|
Left,
|
2016-08-23 12:39:36 -05:00
|
|
|
/// The operator is not associative.
|
2016-06-29 14:23:21 -05:00
|
|
|
None,
|
2016-08-23 12:39:36 -05:00
|
|
|
/// The operator is right-associative.
|
2016-06-29 14:23:21 -05:00
|
|
|
Right,
|
|
|
|
}
|
|
|
|
|
2019-01-30 19:15:29 -06:00
|
|
|
/// Returns the associativity/fixity of an operator. The difference with
|
2019-03-10 12:19:47 -05:00
|
|
|
/// `AssocOp::fixity` is that an operator can be both left and right associative
|
|
|
|
/// (such as `+`: `a + b + c == (a + b) + c == a + (b + c)`.
|
2016-06-29 14:23:21 -05:00
|
|
|
///
|
2017-08-09 02:30:56 -05:00
|
|
|
/// Chained `as` and explicit `:` type coercion never need inner parenthesis so
|
|
|
|
/// they are considered
|
2016-06-29 14:23:21 -05:00
|
|
|
/// associative.
|
2019-09-18 01:37:41 -05:00
|
|
|
#[must_use]
|
2020-07-14 07:59:59 -05:00
|
|
|
fn associativity(op: AssocOp) -> Associativity {
|
2020-02-29 21:23:33 -06:00
|
|
|
use rustc_ast::util::parser::AssocOp::{
|
2023-05-05 10:45:49 -05:00
|
|
|
Add, As, Assign, AssignOp, BitAnd, BitOr, BitXor, Divide, DotDot, DotDotEq, Equal, Greater, GreaterEqual, LAnd,
|
|
|
|
LOr, Less, LessEqual, Modulus, Multiply, NotEqual, ShiftLeft, ShiftRight, Subtract,
|
2020-02-21 02:39:38 -06:00
|
|
|
};
|
2016-06-29 14:23:21 -05:00
|
|
|
|
2020-07-14 07:59:59 -05:00
|
|
|
match op {
|
2019-05-24 08:25:36 -05:00
|
|
|
Assign | AssignOp(_) => Associativity::Right,
|
2023-03-14 11:23:34 -05:00
|
|
|
Add | BitAnd | BitOr | BitXor | LAnd | LOr | Multiply | As => Associativity::Both,
|
2018-11-27 14:14:15 -06:00
|
|
|
Divide | Equal | Greater | GreaterEqual | Less | LessEqual | Modulus | NotEqual | ShiftLeft | ShiftRight
|
|
|
|
| Subtract => Associativity::Left,
|
2017-09-28 09:11:34 -05:00
|
|
|
DotDot | DotDotEq => Associativity::None,
|
2016-06-29 14:23:21 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-30 19:15:29 -06:00
|
|
|
/// Converts a `hir::BinOp` to the corresponding assigning binary operator.
|
2016-06-29 14:23:21 -05:00
|
|
|
fn hirbinop2assignop(op: hir::BinOp) -> AssocOp {
|
2020-02-29 21:23:33 -06:00
|
|
|
use rustc_ast::token::BinOpToken::{And, Caret, Minus, Or, Percent, Plus, Shl, Shr, Slash, Star};
|
2016-06-29 14:23:21 -05:00
|
|
|
|
|
|
|
AssocOp::AssignOp(match op.node {
|
2018-07-16 08:07:39 -05:00
|
|
|
hir::BinOpKind::Add => Plus,
|
|
|
|
hir::BinOpKind::BitAnd => And,
|
|
|
|
hir::BinOpKind::BitOr => Or,
|
|
|
|
hir::BinOpKind::BitXor => Caret,
|
|
|
|
hir::BinOpKind::Div => Slash,
|
|
|
|
hir::BinOpKind::Mul => Star,
|
|
|
|
hir::BinOpKind::Rem => Percent,
|
|
|
|
hir::BinOpKind::Shl => Shl,
|
|
|
|
hir::BinOpKind::Shr => Shr,
|
|
|
|
hir::BinOpKind::Sub => Minus,
|
|
|
|
|
2018-11-27 14:14:15 -06:00
|
|
|
hir::BinOpKind::And
|
2018-07-16 08:07:39 -05:00
|
|
|
| hir::BinOpKind::Eq
|
|
|
|
| hir::BinOpKind::Ge
|
|
|
|
| hir::BinOpKind::Gt
|
|
|
|
| hir::BinOpKind::Le
|
|
|
|
| hir::BinOpKind::Lt
|
|
|
|
| hir::BinOpKind::Ne
|
2018-11-27 14:14:15 -06:00
|
|
|
| hir::BinOpKind::Or => panic!("This operator does not exist"),
|
2016-06-29 14:23:21 -05:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2019-01-30 19:15:29 -06:00
|
|
|
/// Converts an `ast::BinOp` to the corresponding assigning binary operator.
|
2016-06-29 14:23:21 -05:00
|
|
|
fn astbinop2assignop(op: ast::BinOp) -> AssocOp {
|
2020-02-29 21:23:33 -06:00
|
|
|
use rustc_ast::ast::BinOpKind::{
|
2020-02-21 02:39:38 -06:00
|
|
|
Add, And, BitAnd, BitOr, BitXor, Div, Eq, Ge, Gt, Le, Lt, Mul, Ne, Or, Rem, Shl, Shr, Sub,
|
|
|
|
};
|
2020-02-29 21:23:33 -06:00
|
|
|
use rustc_ast::token::BinOpToken;
|
2016-06-29 14:23:21 -05:00
|
|
|
|
|
|
|
AssocOp::AssignOp(match op.node {
|
|
|
|
Add => BinOpToken::Plus,
|
|
|
|
BitAnd => BinOpToken::And,
|
|
|
|
BitOr => BinOpToken::Or,
|
|
|
|
BitXor => BinOpToken::Caret,
|
|
|
|
Div => BinOpToken::Slash,
|
|
|
|
Mul => BinOpToken::Star,
|
|
|
|
Rem => BinOpToken::Percent,
|
|
|
|
Shl => BinOpToken::Shl,
|
|
|
|
Shr => BinOpToken::Shr,
|
|
|
|
Sub => BinOpToken::Minus,
|
|
|
|
And | Eq | Ge | Gt | Le | Lt | Ne | Or => panic!("This operator does not exist"),
|
|
|
|
})
|
|
|
|
}
|
2016-07-10 07:07:13 -05:00
|
|
|
|
2019-01-30 19:15:29 -06:00
|
|
|
/// Returns the indentation before `span` if there are nothing but `[ \t]`
|
2017-08-09 02:30:56 -05:00
|
|
|
/// before it on its line.
|
2019-06-11 22:07:48 -05:00
|
|
|
fn indentation<T: LintContext>(cx: &T, span: Span) -> Option<String> {
|
2018-08-19 21:06:53 -05:00
|
|
|
let lo = cx.sess().source_map().lookup_char_pos(span.lo());
|
2020-07-14 07:59:59 -05:00
|
|
|
lo.file
|
|
|
|
.get_line(lo.line - 1 /* line numbers in `Loc` are 1-based */)
|
|
|
|
.and_then(|line| {
|
|
|
|
if let Some((pos, _)) = line.char_indices().find(|&(_, c)| c != ' ' && c != '\t') {
|
|
|
|
// We can mix char and byte positions here because we only consider `[ \t]`.
|
|
|
|
if lo.col == CharPos(pos) {
|
|
|
|
Some(line[..pos].into())
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
2016-07-10 07:07:13 -05:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
2020-07-14 07:59:59 -05:00
|
|
|
})
|
2016-07-10 07:07:13 -05:00
|
|
|
}
|
|
|
|
|
2024-02-22 17:20:45 -06:00
|
|
|
/// Convenience extension trait for `Diag`.
|
2024-02-28 23:34:08 -06:00
|
|
|
pub trait DiagExt<T: LintContext> {
|
2016-07-10 07:07:13 -05:00
|
|
|
/// Suggests to add an attribute to an item.
|
|
|
|
///
|
|
|
|
/// Correctly handles indentation of the attribute and item.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
2016-12-21 03:00:13 -06:00
|
|
|
/// ```rust,ignore
|
2020-04-17 01:08:00 -05:00
|
|
|
/// diag.suggest_item_with_attr(cx, item, "#[derive(Default)]");
|
2016-07-10 07:07:13 -05:00
|
|
|
/// ```
|
2018-11-27 14:14:15 -06:00
|
|
|
fn suggest_item_with_attr<D: Display + ?Sized>(
|
|
|
|
&mut self,
|
|
|
|
cx: &T,
|
|
|
|
item: Span,
|
|
|
|
msg: &str,
|
|
|
|
attr: &D,
|
|
|
|
applicability: Applicability,
|
|
|
|
);
|
2016-07-10 07:07:13 -05:00
|
|
|
|
|
|
|
/// Suggest to add an item before another.
|
|
|
|
///
|
2020-05-28 08:45:24 -05:00
|
|
|
/// The item should not be indented (except for inner indentation).
|
2016-07-10 07:07:13 -05:00
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
2016-12-21 03:00:13 -06:00
|
|
|
/// ```rust,ignore
|
2020-04-17 01:08:00 -05:00
|
|
|
/// diag.suggest_prepend_item(cx, item,
|
2016-07-10 07:07:13 -05:00
|
|
|
/// "fn foo() {
|
|
|
|
/// bar();
|
|
|
|
/// }");
|
|
|
|
/// ```
|
2018-09-15 11:28:51 -05:00
|
|
|
fn suggest_prepend_item(&mut self, cx: &T, item: Span, msg: &str, new_item: &str, applicability: Applicability);
|
2018-01-17 13:08:03 -06:00
|
|
|
|
|
|
|
/// Suggest to completely remove an item.
|
|
|
|
///
|
|
|
|
/// This will remove an item and all following whitespace until the next non-whitespace
|
|
|
|
/// character. This should work correctly if item is on the same indentation level as the
|
|
|
|
/// following item.
|
|
|
|
///
|
|
|
|
/// # Example
|
|
|
|
///
|
|
|
|
/// ```rust,ignore
|
2020-04-17 01:08:00 -05:00
|
|
|
/// diag.suggest_remove_item(cx, item, "remove this")
|
2018-01-17 13:08:03 -06:00
|
|
|
/// ```
|
2018-09-15 11:28:51 -05:00
|
|
|
fn suggest_remove_item(&mut self, cx: &T, item: Span, msg: &str, applicability: Applicability);
|
2016-07-10 07:07:13 -05:00
|
|
|
}
|
|
|
|
|
2024-02-28 23:34:08 -06:00
|
|
|
impl<T: LintContext> DiagExt<T> for rustc_errors::Diag<'_, ()> {
|
2018-11-27 14:14:15 -06:00
|
|
|
fn suggest_item_with_attr<D: Display + ?Sized>(
|
|
|
|
&mut self,
|
|
|
|
cx: &T,
|
|
|
|
item: Span,
|
|
|
|
msg: &str,
|
|
|
|
attr: &D,
|
|
|
|
applicability: Applicability,
|
|
|
|
) {
|
2016-07-10 07:07:13 -05:00
|
|
|
if let Some(indent) = indentation(cx, item) {
|
2017-08-31 07:47:45 -05:00
|
|
|
let span = item.with_hi(item.lo());
|
2016-07-10 07:07:13 -05:00
|
|
|
|
Use `Cow` in `{D,Subd}iagnosticMessage`.
Each of `{D,Subd}iagnosticMessage::{Str,Eager}` has a comment:
```
// FIXME(davidtwco): can a `Cow<'static, str>` be used here?
```
This commit answers that question in the affirmative. It's not the most
compelling change ever, but it might be worth merging.
This requires changing the `impl<'a> From<&'a str>` impls to `impl
From<&'static str>`, which involves a bunch of knock-on changes that
require/result in call sites being a little more precise about exactly
what kind of string they use to create errors, and not just `&str`. This
will result in fewer unnecessary allocations, though this will not have
any notable perf effects given that these are error paths.
Note that I was lazy within Clippy, using `to_string` in a few places to
preserve the existing string imprecision. I could have used `impl
Into<{D,Subd}iagnosticMessage>` in various places as is done in the
compiler, but that would have required changes to *many* call sites
(mostly changing `&format("...")` to `format!("...")`) which didn't seem
worthwhile.
2023-05-03 19:55:21 -05:00
|
|
|
self.span_suggestion(span, msg.to_string(), format!("{attr}\n{indent}"), applicability);
|
2016-07-10 07:07:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-15 11:28:51 -05:00
|
|
|
fn suggest_prepend_item(&mut self, cx: &T, item: Span, msg: &str, new_item: &str, applicability: Applicability) {
|
2016-07-10 07:07:13 -05:00
|
|
|
if let Some(indent) = indentation(cx, item) {
|
2017-08-31 07:47:45 -05:00
|
|
|
let span = item.with_hi(item.lo());
|
2016-07-10 07:07:13 -05:00
|
|
|
|
|
|
|
let mut first = true;
|
2017-08-09 02:30:56 -05:00
|
|
|
let new_item = new_item
|
|
|
|
.lines()
|
2017-11-04 14:55:56 -05:00
|
|
|
.map(|l| {
|
|
|
|
if first {
|
|
|
|
first = false;
|
2022-10-06 02:44:38 -05:00
|
|
|
format!("{l}\n")
|
2017-11-04 14:55:56 -05:00
|
|
|
} else {
|
2022-10-06 02:44:38 -05:00
|
|
|
format!("{indent}{l}\n")
|
2017-11-04 14:55:56 -05:00
|
|
|
}
|
2016-12-20 11:21:30 -06:00
|
|
|
})
|
|
|
|
.collect::<String>();
|
2016-07-10 07:07:13 -05:00
|
|
|
|
Use `Cow` in `{D,Subd}iagnosticMessage`.
Each of `{D,Subd}iagnosticMessage::{Str,Eager}` has a comment:
```
// FIXME(davidtwco): can a `Cow<'static, str>` be used here?
```
This commit answers that question in the affirmative. It's not the most
compelling change ever, but it might be worth merging.
This requires changing the `impl<'a> From<&'a str>` impls to `impl
From<&'static str>`, which involves a bunch of knock-on changes that
require/result in call sites being a little more precise about exactly
what kind of string they use to create errors, and not just `&str`. This
will result in fewer unnecessary allocations, though this will not have
any notable perf effects given that these are error paths.
Note that I was lazy within Clippy, using `to_string` in a few places to
preserve the existing string imprecision. I could have used `impl
Into<{D,Subd}iagnosticMessage>` in various places as is done in the
compiler, but that would have required changes to *many* call sites
(mostly changing `&format("...")` to `format!("...")`) which didn't seem
worthwhile.
2023-05-03 19:55:21 -05:00
|
|
|
self.span_suggestion(span, msg.to_string(), format!("{new_item}\n{indent}"), applicability);
|
2016-07-10 07:07:13 -05:00
|
|
|
}
|
|
|
|
}
|
2018-01-17 13:08:03 -06:00
|
|
|
|
2018-09-15 11:28:51 -05:00
|
|
|
fn suggest_remove_item(&mut self, cx: &T, item: Span, msg: &str, applicability: Applicability) {
|
2018-01-17 13:08:03 -06:00
|
|
|
let mut remove_span = item;
|
2022-10-18 22:46:26 -05:00
|
|
|
let fmpos = cx.sess().source_map().lookup_byte_offset(remove_span.hi());
|
2018-01-17 13:08:03 -06:00
|
|
|
|
2018-10-29 23:06:37 -05:00
|
|
|
if let Some(ref src) = fmpos.sf.src {
|
2018-01-17 13:08:03 -06:00
|
|
|
let non_whitespace_offset = src[fmpos.pos.to_usize()..].find(|c| c != ' ' && c != '\t' && c != '\n');
|
|
|
|
|
|
|
|
if let Some(non_whitespace_offset) = non_whitespace_offset {
|
2018-11-27 14:14:15 -06:00
|
|
|
remove_span = remove_span
|
2021-06-03 01:41:37 -05:00
|
|
|
.with_hi(remove_span.hi() + BytePos(non_whitespace_offset.try_into().expect("offset too large")));
|
2018-01-17 13:08:03 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Use `Cow` in `{D,Subd}iagnosticMessage`.
Each of `{D,Subd}iagnosticMessage::{Str,Eager}` has a comment:
```
// FIXME(davidtwco): can a `Cow<'static, str>` be used here?
```
This commit answers that question in the affirmative. It's not the most
compelling change ever, but it might be worth merging.
This requires changing the `impl<'a> From<&'a str>` impls to `impl
From<&'static str>`, which involves a bunch of knock-on changes that
require/result in call sites being a little more precise about exactly
what kind of string they use to create errors, and not just `&str`. This
will result in fewer unnecessary allocations, though this will not have
any notable perf effects given that these are error paths.
Note that I was lazy within Clippy, using `to_string` in a few places to
preserve the existing string imprecision. I could have used `impl
Into<{D,Subd}iagnosticMessage>` in various places as is done in the
compiler, but that would have required changes to *many* call sites
(mostly changing `&format("...")` to `format!("...")`) which didn't seem
worthwhile.
2023-05-03 19:55:21 -05:00
|
|
|
self.span_suggestion(remove_span, msg.to_string(), "", applicability);
|
2018-01-17 13:08:03 -06:00
|
|
|
}
|
2016-07-10 07:07:13 -05:00
|
|
|
}
|
2019-01-22 05:33:47 -06:00
|
|
|
|
2021-12-06 05:33:31 -06:00
|
|
|
/// Suggestion results for handling closure
|
|
|
|
/// args dereferencing and borrowing
|
|
|
|
pub struct DerefClosure {
|
|
|
|
/// confidence on the built suggestion
|
|
|
|
pub applicability: Applicability,
|
|
|
|
/// gradually built suggestion
|
|
|
|
pub suggestion: String,
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Build suggestion gradually by handling closure arg specific usages,
|
|
|
|
/// such as explicit deref and borrowing cases.
|
|
|
|
/// Returns `None` if no such use cases have been triggered in closure body
|
|
|
|
///
|
|
|
|
/// note: this only works on single line immutable closures with exactly one input parameter.
|
2022-11-21 13:34:47 -06:00
|
|
|
pub fn deref_closure_args(cx: &LateContext<'_>, closure: &hir::Expr<'_>) -> Option<DerefClosure> {
|
2024-04-04 12:52:55 -05:00
|
|
|
if let ExprKind::Closure(&Closure {
|
2023-02-10 07:01:19 -06:00
|
|
|
fn_decl, def_id, body, ..
|
|
|
|
}) = closure.kind
|
|
|
|
{
|
2022-06-11 14:25:25 -05:00
|
|
|
let closure_body = cx.tcx.hir().body(body);
|
2021-12-06 05:33:31 -06:00
|
|
|
// is closure arg a type annotated double reference (i.e.: `|x: &&i32| ...`)
|
|
|
|
// a type annotation is present if param `kind` is different from `TyKind::Infer`
|
2022-12-28 11:06:11 -06:00
|
|
|
let closure_arg_is_type_annotated_double_ref = if let TyKind::Ref(_, MutTy { ty, .. }) = fn_decl.inputs[0].kind
|
2021-12-06 05:33:31 -06:00
|
|
|
{
|
2022-12-28 11:06:11 -06:00
|
|
|
matches!(ty.kind, TyKind::Ref(_, MutTy { .. }))
|
2021-12-06 05:33:31 -06:00
|
|
|
} else {
|
|
|
|
false
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut visitor = DerefDelegate {
|
|
|
|
cx,
|
|
|
|
closure_span: closure.span,
|
|
|
|
closure_arg_is_type_annotated_double_ref,
|
|
|
|
next_pos: closure.span.lo(),
|
|
|
|
suggestion_start: String::new(),
|
2022-03-24 08:50:04 -05:00
|
|
|
applicability: Applicability::MachineApplicable,
|
2021-12-06 05:33:31 -06:00
|
|
|
};
|
|
|
|
|
2024-05-09 10:33:53 -05:00
|
|
|
ExprUseVisitor::for_clippy(cx, def_id, &mut visitor)
|
|
|
|
.consume_body(closure_body)
|
|
|
|
.into_ok();
|
2021-12-06 05:33:31 -06:00
|
|
|
|
|
|
|
if !visitor.suggestion_start.is_empty() {
|
|
|
|
return Some(DerefClosure {
|
|
|
|
applicability: visitor.applicability,
|
|
|
|
suggestion: visitor.finish(),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Visitor struct used for tracking down
|
|
|
|
/// dereferencing and borrowing of closure's args
|
|
|
|
struct DerefDelegate<'a, 'tcx> {
|
|
|
|
/// The late context of the lint
|
|
|
|
cx: &'a LateContext<'tcx>,
|
|
|
|
/// The span of the input closure to adapt
|
|
|
|
closure_span: Span,
|
|
|
|
/// Indicates if the arg of the closure is a type annotated double reference
|
|
|
|
closure_arg_is_type_annotated_double_ref: bool,
|
|
|
|
/// last position of the span to gradually build the suggestion
|
|
|
|
next_pos: BytePos,
|
|
|
|
/// starting part of the gradually built suggestion
|
|
|
|
suggestion_start: String,
|
|
|
|
/// confidence on the built suggestion
|
|
|
|
applicability: Applicability,
|
|
|
|
}
|
|
|
|
|
2022-01-13 06:18:19 -06:00
|
|
|
impl<'tcx> DerefDelegate<'_, 'tcx> {
|
2021-12-06 05:33:31 -06:00
|
|
|
/// build final suggestion:
|
|
|
|
/// - create the ending part of suggestion
|
|
|
|
/// - concatenate starting and ending parts
|
|
|
|
/// - potentially remove needless borrowing
|
|
|
|
pub fn finish(&mut self) -> String {
|
|
|
|
let end_span = Span::new(self.next_pos, self.closure_span.hi(), self.closure_span.ctxt(), None);
|
|
|
|
let end_snip = snippet_with_applicability(self.cx, end_span, "..", &mut self.applicability);
|
2022-10-06 02:44:38 -05:00
|
|
|
let sugg = format!("{}{end_snip}", self.suggestion_start);
|
2021-12-06 05:33:31 -06:00
|
|
|
if self.closure_arg_is_type_annotated_double_ref {
|
|
|
|
sugg.replacen('&', "", 1)
|
|
|
|
} else {
|
|
|
|
sugg
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// indicates whether the function from `parent_expr` takes its args by double reference
|
|
|
|
fn func_takes_arg_by_double_ref(&self, parent_expr: &'tcx hir::Expr<'_>, cmt_hir_id: HirId) -> bool {
|
2022-07-18 02:39:37 -05:00
|
|
|
let ty = match parent_expr.kind {
|
2022-09-01 04:43:35 -05:00
|
|
|
ExprKind::MethodCall(_, receiver, call_args, _) => {
|
2022-07-18 02:39:37 -05:00
|
|
|
if let Some(sig) = self
|
|
|
|
.cx
|
|
|
|
.typeck_results()
|
|
|
|
.type_dependent_def_id(parent_expr.hir_id)
|
2023-07-11 16:35:29 -05:00
|
|
|
.map(|did| self.cx.tcx.fn_sig(did).instantiate_identity().skip_binder())
|
2022-07-18 02:39:37 -05:00
|
|
|
{
|
2022-09-01 04:43:35 -05:00
|
|
|
std::iter::once(receiver)
|
|
|
|
.chain(call_args.iter())
|
2022-07-18 02:39:37 -05:00
|
|
|
.position(|arg| arg.hir_id == cmt_hir_id)
|
|
|
|
.map(|i| sig.inputs()[i])
|
2021-12-06 05:33:31 -06:00
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
ExprKind::Call(func, call_args) => {
|
2022-07-18 02:39:37 -05:00
|
|
|
if let Some(sig) = expr_sig(self.cx, func) {
|
|
|
|
call_args
|
|
|
|
.iter()
|
|
|
|
.position(|arg| arg.hir_id == cmt_hir_id)
|
|
|
|
.and_then(|i| sig.input(i))
|
|
|
|
.map(ty::Binder::skip_binder)
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
2021-12-06 05:33:31 -06:00
|
|
|
},
|
|
|
|
_ => return false,
|
|
|
|
};
|
|
|
|
|
2022-07-18 02:39:37 -05:00
|
|
|
ty.map_or(false, |ty| matches!(ty.kind(), ty::Ref(_, inner, _) if inner.is_ref()))
|
2021-12-06 05:33:31 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'tcx> Delegate<'tcx> for DerefDelegate<'_, 'tcx> {
|
|
|
|
fn consume(&mut self, _: &PlaceWithHirId<'tcx>, _: HirId) {}
|
|
|
|
|
|
|
|
fn borrow(&mut self, cmt: &PlaceWithHirId<'tcx>, _: HirId, _: ty::BorrowKind) {
|
|
|
|
if let PlaceBase::Local(id) = cmt.place.base {
|
|
|
|
let map = self.cx.tcx.hir();
|
|
|
|
let span = map.span(cmt.hir_id);
|
|
|
|
let start_span = Span::new(self.next_pos, span.lo(), span.ctxt(), None);
|
|
|
|
let mut start_snip = snippet_with_applicability(self.cx, start_span, "..", &mut self.applicability);
|
|
|
|
|
|
|
|
// identifier referring to the variable currently triggered (i.e.: `fp`)
|
|
|
|
let ident_str = map.name(id).to_string();
|
|
|
|
// full identifier that includes projection (i.e.: `fp.field`)
|
|
|
|
let ident_str_with_proj = snippet(self.cx, span, "..").to_string();
|
|
|
|
|
|
|
|
if cmt.place.projections.is_empty() {
|
|
|
|
// handle item without any projection, that needs an explicit borrowing
|
|
|
|
// i.e.: suggest `&x` instead of `x`
|
2023-02-25 18:08:29 -06:00
|
|
|
let _: fmt::Result = write!(self.suggestion_start, "{start_snip}&{ident_str}");
|
2021-12-06 05:33:31 -06:00
|
|
|
} else {
|
|
|
|
// cases where a parent `Call` or `MethodCall` is using the item
|
|
|
|
// i.e.: suggest `.contains(&x)` for `.find(|x| [1, 2, 3].contains(x)).is_none()`
|
|
|
|
//
|
|
|
|
// Note about method calls:
|
|
|
|
// - compiler automatically dereference references if the target type is a reference (works also for
|
|
|
|
// function call)
|
|
|
|
// - `self` arguments in the case of `x.is_something()` are also automatically (de)referenced, and
|
|
|
|
// no projection should be suggested
|
|
|
|
if let Some(parent_expr) = get_parent_expr_for_hir(self.cx, cmt.hir_id) {
|
|
|
|
match &parent_expr.kind {
|
|
|
|
// given expression is the self argument and will be handled completely by the compiler
|
|
|
|
// i.e.: `|x| x.is_something()`
|
2022-09-01 04:43:35 -05:00
|
|
|
ExprKind::MethodCall(_, self_expr, ..) if self_expr.hir_id == cmt.hir_id => {
|
2023-02-25 18:08:29 -06:00
|
|
|
let _: fmt::Result = write!(self.suggestion_start, "{start_snip}{ident_str_with_proj}");
|
2021-12-06 05:33:31 -06:00
|
|
|
self.next_pos = span.hi();
|
|
|
|
return;
|
|
|
|
},
|
|
|
|
// item is used in a call
|
|
|
|
// i.e.: `Call`: `|x| please(x)` or `MethodCall`: `|x| [1, 2, 3].contains(x)`
|
2023-07-02 07:35:19 -05:00
|
|
|
ExprKind::Call(_, call_args) | ExprKind::MethodCall(_, _, call_args, _) => {
|
2021-12-06 05:33:31 -06:00
|
|
|
let expr = self.cx.tcx.hir().expect_expr(cmt.hir_id);
|
|
|
|
let arg_ty_kind = self.cx.typeck_results().expr_ty(expr).kind();
|
|
|
|
|
|
|
|
if matches!(arg_ty_kind, ty::Ref(_, _, Mutability::Not)) {
|
|
|
|
// suggest ampersand if call function is taking args by double reference
|
|
|
|
let takes_arg_by_double_ref =
|
|
|
|
self.func_takes_arg_by_double_ref(parent_expr, cmt.hir_id);
|
|
|
|
|
|
|
|
// compiler will automatically dereference field or index projection, so no need
|
|
|
|
// to suggest ampersand, but full identifier that includes projection is required
|
|
|
|
let has_field_or_index_projection =
|
|
|
|
cmt.place.projections.iter().any(|proj| {
|
|
|
|
matches!(proj.kind, ProjectionKind::Field(..) | ProjectionKind::Index)
|
|
|
|
});
|
|
|
|
|
|
|
|
// no need to bind again if the function doesn't take arg by double ref
|
|
|
|
// and if the item is already a double ref
|
|
|
|
let ident_sugg = if !call_args.is_empty()
|
|
|
|
&& !takes_arg_by_double_ref
|
|
|
|
&& (self.closure_arg_is_type_annotated_double_ref || has_field_or_index_projection)
|
|
|
|
{
|
|
|
|
let ident = if has_field_or_index_projection {
|
|
|
|
ident_str_with_proj
|
|
|
|
} else {
|
|
|
|
ident_str
|
|
|
|
};
|
2022-10-06 02:44:38 -05:00
|
|
|
format!("{start_snip}{ident}")
|
2021-12-06 05:33:31 -06:00
|
|
|
} else {
|
2022-10-06 02:44:38 -05:00
|
|
|
format!("{start_snip}&{ident_str}")
|
2021-12-06 05:33:31 -06:00
|
|
|
};
|
|
|
|
self.suggestion_start.push_str(&ident_sugg);
|
|
|
|
self.next_pos = span.hi();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
self.applicability = Applicability::Unspecified;
|
|
|
|
},
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut replacement_str = ident_str;
|
|
|
|
let mut projections_handled = false;
|
|
|
|
cmt.place.projections.iter().enumerate().for_each(|(i, proj)| {
|
|
|
|
match proj.kind {
|
|
|
|
// Field projection like `|v| v.foo`
|
|
|
|
// no adjustment needed here, as field projections are handled by the compiler
|
|
|
|
ProjectionKind::Field(..) => match cmt.place.ty_before_projection(i).kind() {
|
|
|
|
ty::Adt(..) | ty::Tuple(_) => {
|
2024-03-07 10:19:29 -06:00
|
|
|
replacement_str.clone_from(&ident_str_with_proj);
|
2021-12-06 05:33:31 -06:00
|
|
|
projections_handled = true;
|
|
|
|
},
|
|
|
|
_ => (),
|
|
|
|
},
|
|
|
|
// Index projection like `|x| foo[x]`
|
|
|
|
// the index is dropped so we can't get it to build the suggestion,
|
|
|
|
// so the span is set-up again to get more code, using `span.hi()` (i.e.: `foo[x]`)
|
|
|
|
// instead of `span.lo()` (i.e.: `foo`)
|
|
|
|
ProjectionKind::Index => {
|
|
|
|
let start_span = Span::new(self.next_pos, span.hi(), span.ctxt(), None);
|
|
|
|
start_snip = snippet_with_applicability(self.cx, start_span, "..", &mut self.applicability);
|
|
|
|
replacement_str.clear();
|
|
|
|
projections_handled = true;
|
|
|
|
},
|
|
|
|
// note: unable to trigger `Subslice` kind in tests
|
2023-08-11 07:05:13 -05:00
|
|
|
ProjectionKind::Subslice |
|
2023-07-24 09:47:32 -05:00
|
|
|
// Doesn't have surface syntax. Only occurs in patterns.
|
|
|
|
ProjectionKind::OpaqueCast => (),
|
2021-12-06 05:33:31 -06:00
|
|
|
ProjectionKind::Deref => {
|
|
|
|
// Explicit derefs are typically handled later on, but
|
|
|
|
// some items do not need explicit deref, such as array accesses,
|
|
|
|
// so we mark them as already processed
|
|
|
|
// i.e.: don't suggest `*sub[1..4].len()` for `|sub| sub[1..4].len() == 3`
|
|
|
|
if let ty::Ref(_, inner, _) = cmt.place.ty_before_projection(i).kind() {
|
|
|
|
if matches!(inner.kind(), ty::Ref(_, innermost, _) if innermost.is_array()) {
|
|
|
|
projections_handled = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// handle `ProjectionKind::Deref` by removing one explicit deref
|
|
|
|
// if no special case was detected (i.e.: suggest `*x` instead of `**x`)
|
|
|
|
if !projections_handled {
|
|
|
|
let last_deref = cmt
|
|
|
|
.place
|
|
|
|
.projections
|
|
|
|
.iter()
|
|
|
|
.rposition(|proj| proj.kind == ProjectionKind::Deref);
|
|
|
|
|
|
|
|
if let Some(pos) = last_deref {
|
|
|
|
let mut projections = cmt.place.projections.clone();
|
|
|
|
projections.truncate(pos);
|
|
|
|
|
|
|
|
for item in projections {
|
|
|
|
if item.kind == ProjectionKind::Deref {
|
2022-10-06 02:44:38 -05:00
|
|
|
replacement_str = format!("*{replacement_str}");
|
2021-12-06 05:33:31 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-02-25 18:08:29 -06:00
|
|
|
let _: fmt::Result = write!(self.suggestion_start, "{start_snip}{replacement_str}");
|
2021-12-06 05:33:31 -06:00
|
|
|
}
|
|
|
|
self.next_pos = span.hi();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn mutate(&mut self, _: &PlaceWithHirId<'tcx>, _: HirId) {}
|
|
|
|
|
2022-10-23 08:18:45 -05:00
|
|
|
fn fake_read(&mut self, _: &PlaceWithHirId<'tcx>, _: FakeReadCause, _: HirId) {}
|
2021-12-06 05:33:31 -06:00
|
|
|
}
|
|
|
|
|
2019-01-22 05:33:47 -06:00
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use super::Sugg;
|
2021-04-08 10:50:13 -05:00
|
|
|
|
|
|
|
use rustc_ast::util::parser::AssocOp;
|
2019-01-22 05:33:47 -06:00
|
|
|
use std::borrow::Cow;
|
|
|
|
|
|
|
|
const SUGGESTION: Sugg<'static> = Sugg::NonParen(Cow::Borrowed("function_call()"));
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn make_return_transform_sugg_into_a_return_call() {
|
|
|
|
assert_eq!("return function_call()", SUGGESTION.make_return().to_string());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn blockify_transforms_sugg_into_a_block() {
|
|
|
|
assert_eq!("{ function_call() }", SUGGESTION.blockify().to_string());
|
|
|
|
}
|
2021-04-08 10:50:13 -05:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn binop_maybe_par() {
|
2021-12-30 08:10:43 -06:00
|
|
|
let sugg = Sugg::BinOp(AssocOp::Add, "1".into(), "1".into());
|
2021-04-08 10:50:13 -05:00
|
|
|
assert_eq!("(1 + 1)", sugg.maybe_par().to_string());
|
|
|
|
|
2021-12-30 08:10:43 -06:00
|
|
|
let sugg = Sugg::BinOp(AssocOp::Add, "(1 + 1)".into(), "(1 + 1)".into());
|
2021-04-08 10:50:13 -05:00
|
|
|
assert_eq!("((1 + 1) + (1 + 1))", sugg.maybe_par().to_string());
|
|
|
|
}
|
2021-12-30 08:10:43 -06:00
|
|
|
#[test]
|
|
|
|
fn not_op() {
|
|
|
|
use AssocOp::{Add, Equal, Greater, GreaterEqual, LAnd, LOr, Less, LessEqual, NotEqual};
|
|
|
|
|
|
|
|
fn test_not(op: AssocOp, correct: &str) {
|
|
|
|
let sugg = Sugg::BinOp(op, "x".into(), "y".into());
|
|
|
|
assert_eq!((!sugg).to_string(), correct);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Invert the comparison operator.
|
|
|
|
test_not(Equal, "x != y");
|
|
|
|
test_not(NotEqual, "x == y");
|
|
|
|
test_not(Less, "x >= y");
|
|
|
|
test_not(LessEqual, "x > y");
|
|
|
|
test_not(Greater, "x <= y");
|
|
|
|
test_not(GreaterEqual, "x < y");
|
|
|
|
|
|
|
|
// Other operators are inverted like !(..).
|
|
|
|
test_not(Add, "!(x + y)");
|
|
|
|
test_not(LAnd, "!(x && y)");
|
|
|
|
test_not(LOr, "!(x || y)");
|
|
|
|
}
|
2019-01-22 05:33:47 -06:00
|
|
|
}
|