2021-03-25 13:29:11 -05:00
|
|
|
use clippy_utils::source::snippet_with_applicability;
|
|
|
|
use clippy_utils::ty::is_type_diagnostic_item;
|
|
|
|
use if_chain::if_chain;
|
|
|
|
use rustc_ast::ast;
|
|
|
|
use rustc_errors::Applicability;
|
|
|
|
use rustc_hir as hir;
|
|
|
|
use rustc_lint::LateContext;
|
|
|
|
use rustc_middle::ty::{self, Ty};
|
|
|
|
use rustc_span::symbol::sym;
|
|
|
|
|
|
|
|
pub(super) fn derefs_to_slice<'tcx>(
|
|
|
|
cx: &LateContext<'tcx>,
|
|
|
|
expr: &'tcx hir::Expr<'tcx>,
|
|
|
|
ty: Ty<'tcx>,
|
|
|
|
) -> Option<&'tcx hir::Expr<'tcx>> {
|
|
|
|
fn may_slice<'a>(cx: &LateContext<'a>, ty: Ty<'a>) -> bool {
|
|
|
|
match ty.kind() {
|
|
|
|
ty::Slice(_) => true,
|
|
|
|
ty::Adt(def, _) if def.is_box() => may_slice(cx, ty.boxed_ty()),
|
2021-10-02 18:51:01 -05:00
|
|
|
ty::Adt(..) => is_type_diagnostic_item(cx, ty, sym::Vec),
|
2021-04-27 09:55:11 -05:00
|
|
|
ty::Array(_, size) => size.try_eval_usize(cx.tcx, cx.param_env).is_some(),
|
Overhaul `TyS` and `Ty`.
Specifically, change `Ty` from this:
```
pub type Ty<'tcx> = &'tcx TyS<'tcx>;
```
to this
```
pub struct Ty<'tcx>(Interned<'tcx, TyS<'tcx>>);
```
There are two benefits to this.
- It's now a first class type, so we can define methods on it. This
means we can move a lot of methods away from `TyS`, leaving `TyS` as a
barely-used type, which is appropriate given that it's not meant to
be used directly.
- The uniqueness requirement is now explicit, via the `Interned` type.
E.g. the pointer-based `Eq` and `Hash` comes from `Interned`, rather
than via `TyS`, which wasn't obvious at all.
Much of this commit is boring churn. The interesting changes are in
these files:
- compiler/rustc_middle/src/arena.rs
- compiler/rustc_middle/src/mir/visit.rs
- compiler/rustc_middle/src/ty/context.rs
- compiler/rustc_middle/src/ty/mod.rs
Specifically:
- Most mentions of `TyS` are removed. It's very much a dumb struct now;
`Ty` has all the smarts.
- `TyS` now has `crate` visibility instead of `pub`.
- `TyS::make_for_test` is removed in favour of the static `BOOL_TY`,
which just works better with the new structure.
- The `Eq`/`Ord`/`Hash` impls are removed from `TyS`. `Interned`s impls
of `Eq`/`Hash` now suffice. `Ord` is now partly on `Interned`
(pointer-based, for the `Equal` case) and partly on `TyS`
(contents-based, for the other cases).
- There are many tedious sigil adjustments, i.e. adding or removing `*`
or `&`. They seem to be unavoidable.
2022-01-24 21:13:38 -06:00
|
|
|
ty::Ref(_, inner, _) => may_slice(cx, *inner),
|
2021-03-25 13:29:11 -05:00
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-12-01 11:17:50 -06:00
|
|
|
if let hir::ExprKind::MethodCall(path, [self_arg, ..], _) = &expr.kind {
|
2021-09-08 09:31:47 -05:00
|
|
|
if path.ident.name == sym::iter && may_slice(cx, cx.typeck_results().expr_ty(self_arg)) {
|
|
|
|
Some(self_arg)
|
2021-03-25 13:29:11 -05:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
match ty.kind() {
|
|
|
|
ty::Slice(_) => Some(expr),
|
|
|
|
ty::Adt(def, _) if def.is_box() && may_slice(cx, ty.boxed_ty()) => Some(expr),
|
|
|
|
ty::Ref(_, inner, _) => {
|
Overhaul `TyS` and `Ty`.
Specifically, change `Ty` from this:
```
pub type Ty<'tcx> = &'tcx TyS<'tcx>;
```
to this
```
pub struct Ty<'tcx>(Interned<'tcx, TyS<'tcx>>);
```
There are two benefits to this.
- It's now a first class type, so we can define methods on it. This
means we can move a lot of methods away from `TyS`, leaving `TyS` as a
barely-used type, which is appropriate given that it's not meant to
be used directly.
- The uniqueness requirement is now explicit, via the `Interned` type.
E.g. the pointer-based `Eq` and `Hash` comes from `Interned`, rather
than via `TyS`, which wasn't obvious at all.
Much of this commit is boring churn. The interesting changes are in
these files:
- compiler/rustc_middle/src/arena.rs
- compiler/rustc_middle/src/mir/visit.rs
- compiler/rustc_middle/src/ty/context.rs
- compiler/rustc_middle/src/ty/mod.rs
Specifically:
- Most mentions of `TyS` are removed. It's very much a dumb struct now;
`Ty` has all the smarts.
- `TyS` now has `crate` visibility instead of `pub`.
- `TyS::make_for_test` is removed in favour of the static `BOOL_TY`,
which just works better with the new structure.
- The `Eq`/`Ord`/`Hash` impls are removed from `TyS`. `Interned`s impls
of `Eq`/`Hash` now suffice. `Ord` is now partly on `Interned`
(pointer-based, for the `Equal` case) and partly on `TyS`
(contents-based, for the other cases).
- There are many tedious sigil adjustments, i.e. adding or removing `*`
or `&`. They seem to be unavoidable.
2022-01-24 21:13:38 -06:00
|
|
|
if may_slice(cx, *inner) {
|
2021-03-25 13:29:11 -05:00
|
|
|
Some(expr)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
},
|
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub(super) fn get_hint_if_single_char_arg(
|
|
|
|
cx: &LateContext<'_>,
|
|
|
|
arg: &hir::Expr<'_>,
|
|
|
|
applicability: &mut Applicability,
|
|
|
|
) -> Option<String> {
|
|
|
|
if_chain! {
|
|
|
|
if let hir::ExprKind::Lit(lit) = &arg.kind;
|
|
|
|
if let ast::LitKind::Str(r, style) = lit.node;
|
|
|
|
let string = r.as_str();
|
|
|
|
if string.chars().count() == 1;
|
|
|
|
then {
|
2021-12-30 08:10:43 -06:00
|
|
|
let snip = snippet_with_applicability(cx, arg.span, string, applicability);
|
2021-03-25 13:29:11 -05:00
|
|
|
let ch = if let ast::StrStyle::Raw(nhash) = style {
|
|
|
|
let nhash = nhash as usize;
|
|
|
|
// for raw string: r##"a"##
|
|
|
|
&snip[(nhash + 2)..(snip.len() - 1 - nhash)]
|
|
|
|
} else {
|
|
|
|
// for regular string: "a"
|
|
|
|
&snip[1..(snip.len() - 1)]
|
|
|
|
};
|
2021-12-06 05:33:31 -06:00
|
|
|
|
|
|
|
let hint = format!("'{}'", match ch {
|
|
|
|
"'" => "\\'" ,
|
|
|
|
r"\" => "\\\\",
|
|
|
|
_ => ch,
|
|
|
|
});
|
|
|
|
|
2021-03-25 13:29:11 -05:00
|
|
|
Some(hint)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|