2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::diagnostics::{multispan_sugg, span_lint, span_lint_and_then};
|
2022-01-27 14:12:45 +00:00
|
|
|
use clippy_utils::get_enclosing_block;
|
2022-01-13 12:18:19 +00:00
|
|
|
use clippy_utils::macros::{find_assert_eq_args, first_node_macro_backtrace};
|
2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::source::snippet;
|
|
|
|
use clippy_utils::ty::{implements_trait, is_copy};
|
2022-01-13 12:18:19 +00:00
|
|
|
use clippy_utils::{ast_utils::is_useless_with_eq_exprs, eq_expr_value, is_in_test_function};
|
2020-10-23 20:16:59 +00:00
|
|
|
use if_chain::if_chain;
|
2018-12-29 15:04:45 +00:00
|
|
|
use rustc_errors::Applicability;
|
2022-02-26 13:26:21 +00:00
|
|
|
use rustc_hir::{def::Res, def_id::DefId, BinOpKind, BorrowKind, Expr, ExprKind, GenericArg, ItemKind, QPath, TyKind};
|
2020-01-12 06:08:41 +00:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
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-25 03:13:38 +00:00
|
|
|
use rustc_middle::ty::{self, Ty};
|
2020-01-11 11:37:08 +00:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2015-04-30 09:48:43 +00:00
|
|
|
|
2018-03-28 13:24:26 +00:00
|
|
|
declare_clippy_lint! {
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for equal operands to comparison, logical and
|
2019-03-05 16:50:33 +00:00
|
|
|
/// bitwise, difference and division binary operators (`==`, `>`, etc., `&&`,
|
|
|
|
/// `||`, `&`, `|`, `^`, `-` and `/`).
|
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// This is usually just a typo or a copy and paste error.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Known problems
|
|
|
|
/// False negatives: We had some false positives regarding
|
2019-03-05 16:50:33 +00:00
|
|
|
/// calls (notably [racer](https://github.com/phildawes/racer) had one instance
|
|
|
|
/// of `x.pop() && x.pop()`), so we removed matching any function or method
|
2020-07-07 15:12:44 +00:00
|
|
|
/// calls. We may introduce a list of known pure functions in the future.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Example
|
2019-03-09 07:51:23 +00:00
|
|
|
/// ```rust
|
|
|
|
/// # let x = 1;
|
|
|
|
/// if x + 1 == x + 1 {}
|
2019-03-05 16:50:33 +00:00
|
|
|
/// ```
|
2020-10-23 20:16:59 +00:00
|
|
|
/// or
|
|
|
|
/// ```rust
|
|
|
|
/// # let a = 3;
|
|
|
|
/// # let b = 4;
|
|
|
|
/// assert_eq!(a, a);
|
|
|
|
/// ```
|
2021-12-06 11:33:31 +00:00
|
|
|
#[clippy::version = "pre 1.29.0"]
|
2015-04-30 09:48:43 +00:00
|
|
|
pub EQ_OP,
|
2018-03-28 13:24:26 +00:00
|
|
|
correctness,
|
2019-01-31 01:15:29 +00:00
|
|
|
"equal operands on both sides of a comparison or bitwise combination (e.g., `x == x`)"
|
2015-04-30 09:48:43 +00:00
|
|
|
}
|
|
|
|
|
2018-03-28 13:24:26 +00:00
|
|
|
declare_clippy_lint! {
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for arguments to `==` which have their address
|
2019-03-05 16:50:33 +00:00
|
|
|
/// taken to satisfy a bound
|
|
|
|
/// and suggests to dereference the other argument instead
|
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// It is more idiomatic to dereference the other argument.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Known problems
|
|
|
|
/// None
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Example
|
2019-03-05 22:23:50 +00:00
|
|
|
/// ```ignore
|
2020-06-09 14:36:01 +00:00
|
|
|
/// // Bad
|
2019-03-05 16:50:33 +00:00
|
|
|
/// &x == y
|
2020-06-09 14:36:01 +00:00
|
|
|
///
|
|
|
|
/// // Good
|
|
|
|
/// x == *y
|
2019-03-05 16:50:33 +00:00
|
|
|
/// ```
|
2021-12-06 11:33:31 +00:00
|
|
|
#[clippy::version = "pre 1.29.0"]
|
2017-03-09 09:56:17 +00:00
|
|
|
pub OP_REF,
|
2018-03-28 13:24:26 +00:00
|
|
|
style,
|
2017-03-09 09:56:17 +00:00
|
|
|
"taking a reference to satisfy the type constraints on `==`"
|
|
|
|
}
|
|
|
|
|
2019-04-08 20:43:55 +00:00
|
|
|
declare_lint_pass!(EqOp => [EQ_OP, OP_REF]);
|
2015-08-11 18:22:20 +00:00
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for EqOp {
|
2019-01-13 15:19:02 +00:00
|
|
|
#[allow(clippy::similar_names, clippy::too_many_lines)]
|
2020-06-25 20:41:36 +00:00
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, e: &'tcx Expr<'_>) {
|
2022-01-13 12:18:19 +00:00
|
|
|
if_chain! {
|
|
|
|
if let Some((macro_call, macro_name)) = first_node_macro_backtrace(cx, e).find_map(|macro_call| {
|
|
|
|
let name = cx.tcx.item_name(macro_call.def_id);
|
|
|
|
matches!(name.as_str(), "assert_eq" | "assert_ne" | "debug_assert_eq" | "debug_assert_ne")
|
|
|
|
.then(|| (macro_call, name))
|
|
|
|
});
|
|
|
|
if let Some((lhs, rhs, _)) = find_assert_eq_args(cx, e, macro_call.expn);
|
|
|
|
if eq_expr_value(cx, lhs, rhs);
|
|
|
|
if macro_call.is_local();
|
|
|
|
if !is_in_test_function(cx.tcx, e.hir_id);
|
|
|
|
then {
|
|
|
|
span_lint(
|
|
|
|
cx,
|
|
|
|
EQ_OP,
|
|
|
|
lhs.span.to(rhs.span),
|
|
|
|
&format!("identical args used in this `{}!` macro call", macro_name),
|
|
|
|
);
|
2020-10-23 20:16:59 +00:00
|
|
|
}
|
|
|
|
}
|
2021-04-08 15:50:13 +00:00
|
|
|
if let ExprKind::Binary(op, left, right) = e.kind {
|
2019-08-19 16:30:32 +00:00
|
|
|
if e.span.from_expansion() {
|
2018-05-29 11:17:37 +00:00
|
|
|
return;
|
|
|
|
}
|
2020-01-22 07:48:00 +00:00
|
|
|
let macro_with_not_op = |expr_kind: &ExprKind<'_>| {
|
2021-04-08 15:50:13 +00:00
|
|
|
if let ExprKind::Unary(_, expr) = *expr_kind {
|
2021-12-06 11:33:31 +00:00
|
|
|
expr.span.from_expansion()
|
2020-01-22 07:48:00 +00:00
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
};
|
|
|
|
if macro_with_not_op(&left.kind) || macro_with_not_op(&right.kind) {
|
|
|
|
return;
|
|
|
|
}
|
2021-10-21 11:11:36 +00:00
|
|
|
if is_useless_with_eq_exprs(op.node.into())
|
|
|
|
&& eq_expr_value(cx, left, right)
|
|
|
|
&& !is_in_test_function(cx.tcx, e.hir_id)
|
|
|
|
{
|
2017-08-09 07:30:56 +00:00
|
|
|
span_lint(
|
|
|
|
cx,
|
|
|
|
EQ_OP,
|
|
|
|
e.span,
|
|
|
|
&format!("equal expressions as operands to `{}`", op.node.as_str()),
|
|
|
|
);
|
2017-04-28 16:13:09 +00:00
|
|
|
return;
|
2017-04-28 15:03:47 +00:00
|
|
|
}
|
|
|
|
let (trait_id, requires_ref) = match op.node {
|
2018-07-12 07:50:09 +00:00
|
|
|
BinOpKind::Add => (cx.tcx.lang_items().add_trait(), false),
|
|
|
|
BinOpKind::Sub => (cx.tcx.lang_items().sub_trait(), false),
|
|
|
|
BinOpKind::Mul => (cx.tcx.lang_items().mul_trait(), false),
|
|
|
|
BinOpKind::Div => (cx.tcx.lang_items().div_trait(), false),
|
|
|
|
BinOpKind::Rem => (cx.tcx.lang_items().rem_trait(), false),
|
2017-04-28 15:03:47 +00:00
|
|
|
// don't lint short circuiting ops
|
2018-07-12 07:50:09 +00:00
|
|
|
BinOpKind::And | BinOpKind::Or => return,
|
|
|
|
BinOpKind::BitXor => (cx.tcx.lang_items().bitxor_trait(), false),
|
|
|
|
BinOpKind::BitAnd => (cx.tcx.lang_items().bitand_trait(), false),
|
|
|
|
BinOpKind::BitOr => (cx.tcx.lang_items().bitor_trait(), false),
|
|
|
|
BinOpKind::Shl => (cx.tcx.lang_items().shl_trait(), false),
|
|
|
|
BinOpKind::Shr => (cx.tcx.lang_items().shr_trait(), false),
|
|
|
|
BinOpKind::Ne | BinOpKind::Eq => (cx.tcx.lang_items().eq_trait(), true),
|
2018-11-27 20:14:15 +00:00
|
|
|
BinOpKind::Lt | BinOpKind::Le | BinOpKind::Ge | BinOpKind::Gt => {
|
2019-12-03 01:01:50 +00:00
|
|
|
(cx.tcx.lang_items().partial_ord_trait(), true)
|
2018-11-27 20:14:15 +00:00
|
|
|
},
|
2017-04-28 15:03:47 +00:00
|
|
|
};
|
|
|
|
if let Some(trait_id) = trait_id {
|
2018-08-01 20:48:41 +00:00
|
|
|
#[allow(clippy::match_same_arms)]
|
2019-09-27 15:16:06 +00:00
|
|
|
match (&left.kind, &right.kind) {
|
2017-04-28 15:03:47 +00:00
|
|
|
// do not suggest to dereference literals
|
2018-07-12 07:30:57 +00:00
|
|
|
(&ExprKind::Lit(..), _) | (_, &ExprKind::Lit(..)) => {},
|
2017-04-28 15:03:47 +00:00
|
|
|
// &foo == &bar
|
2021-04-08 15:50:13 +00:00
|
|
|
(&ExprKind::AddrOf(BorrowKind::Ref, _, l), &ExprKind::AddrOf(BorrowKind::Ref, _, r)) => {
|
2020-07-17 08:47:04 +00:00
|
|
|
let lty = cx.typeck_results().expr_ty(l);
|
|
|
|
let rty = cx.typeck_results().expr_ty(r);
|
2017-06-11 02:34:47 +00:00
|
|
|
let lcpy = is_copy(cx, lty);
|
|
|
|
let rcpy = is_copy(cx, rty);
|
2022-01-27 14:12:45 +00:00
|
|
|
if let Some((self_ty, other_ty)) = in_impl(cx, e, trait_id) {
|
|
|
|
if (are_equal(cx, rty, self_ty) && are_equal(cx, lty, other_ty))
|
|
|
|
|| (are_equal(cx, rty, other_ty) && are_equal(cx, lty, self_ty))
|
|
|
|
{
|
|
|
|
return; // Don't lint
|
|
|
|
}
|
|
|
|
}
|
2017-04-28 15:03:47 +00:00
|
|
|
// either operator autorefs or both args are copyable
|
2018-05-22 13:45:14 +00:00
|
|
|
if (requires_ref || (lcpy && rcpy)) && implements_trait(cx, lty, trait_id, &[rty.into()]) {
|
2017-08-09 07:30:56 +00:00
|
|
|
span_lint_and_then(
|
|
|
|
cx,
|
|
|
|
OP_REF,
|
|
|
|
e.span,
|
|
|
|
"needlessly taken reference of both operands",
|
2020-04-17 06:08:00 +00:00
|
|
|
|diag| {
|
2017-08-09 07:30:56 +00:00
|
|
|
let lsnip = snippet(cx, l.span, "...").to_string();
|
|
|
|
let rsnip = snippet(cx, r.span, "...").to_string();
|
|
|
|
multispan_sugg(
|
2020-04-17 06:08:00 +00:00
|
|
|
diag,
|
2020-05-17 15:36:26 +00:00
|
|
|
"use the values directly",
|
2017-08-09 07:30:56 +00:00
|
|
|
vec![(left.span, lsnip), (right.span, rsnip)],
|
|
|
|
);
|
|
|
|
},
|
2021-06-03 06:41:37 +00:00
|
|
|
);
|
2018-11-27 20:14:15 +00:00
|
|
|
} else if lcpy
|
|
|
|
&& !rcpy
|
2020-07-17 08:47:04 +00:00
|
|
|
&& implements_trait(cx, lty, trait_id, &[cx.typeck_results().expr_ty(right).into()])
|
2018-11-27 20:14:15 +00:00
|
|
|
{
|
2020-04-17 06:09:09 +00:00
|
|
|
span_lint_and_then(
|
|
|
|
cx,
|
|
|
|
OP_REF,
|
|
|
|
e.span,
|
|
|
|
"needlessly taken reference of left operand",
|
|
|
|
|diag| {
|
|
|
|
let lsnip = snippet(cx, l.span, "...").to_string();
|
|
|
|
diag.span_suggestion(
|
|
|
|
left.span,
|
|
|
|
"use the left value directly",
|
|
|
|
lsnip,
|
|
|
|
Applicability::MaybeIncorrect, // FIXME #2597
|
|
|
|
);
|
|
|
|
},
|
2021-06-03 06:41:37 +00:00
|
|
|
);
|
2018-11-27 20:14:15 +00:00
|
|
|
} else if !lcpy
|
|
|
|
&& rcpy
|
2020-07-17 08:47:04 +00:00
|
|
|
&& implements_trait(cx, cx.typeck_results().expr_ty(left), trait_id, &[rty.into()])
|
2018-11-27 20:14:15 +00:00
|
|
|
{
|
2017-08-09 07:30:56 +00:00
|
|
|
span_lint_and_then(
|
|
|
|
cx,
|
|
|
|
OP_REF,
|
|
|
|
e.span,
|
|
|
|
"needlessly taken reference of right operand",
|
2020-04-17 06:08:00 +00:00
|
|
|
|diag| {
|
2017-08-09 07:30:56 +00:00
|
|
|
let rsnip = snippet(cx, r.span, "...").to_string();
|
2020-04-17 06:08:00 +00:00
|
|
|
diag.span_suggestion(
|
2018-09-15 16:14:08 +00:00
|
|
|
right.span,
|
|
|
|
"use the right value directly",
|
|
|
|
rsnip,
|
2019-09-25 21:53:20 +00:00
|
|
|
Applicability::MaybeIncorrect, // FIXME #2597
|
2018-09-18 15:07:54 +00:00
|
|
|
);
|
2017-08-09 07:30:56 +00:00
|
|
|
},
|
2021-06-03 06:41:37 +00:00
|
|
|
);
|
2017-04-28 15:03:47 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
// &foo == bar
|
2021-04-08 15:50:13 +00:00
|
|
|
(&ExprKind::AddrOf(BorrowKind::Ref, _, l), _) => {
|
2020-07-17 08:47:04 +00:00
|
|
|
let lty = cx.typeck_results().expr_ty(l);
|
2022-01-27 14:12:45 +00:00
|
|
|
if let Some((self_ty, other_ty)) = in_impl(cx, e, trait_id) {
|
|
|
|
let rty = cx.typeck_results().expr_ty(right);
|
|
|
|
if (are_equal(cx, rty, self_ty) && are_equal(cx, lty, other_ty))
|
|
|
|
|| (are_equal(cx, rty, other_ty) && are_equal(cx, lty, self_ty))
|
|
|
|
{
|
|
|
|
return; // Don't lint
|
|
|
|
}
|
|
|
|
}
|
2017-06-11 02:34:47 +00:00
|
|
|
let lcpy = is_copy(cx, lty);
|
2018-11-27 20:14:15 +00:00
|
|
|
if (requires_ref || lcpy)
|
2020-07-17 08:47:04 +00:00
|
|
|
&& implements_trait(cx, lty, trait_id, &[cx.typeck_results().expr_ty(right).into()])
|
2018-11-27 20:14:15 +00:00
|
|
|
{
|
2020-04-17 06:09:09 +00:00
|
|
|
span_lint_and_then(
|
|
|
|
cx,
|
|
|
|
OP_REF,
|
|
|
|
e.span,
|
|
|
|
"needlessly taken reference of left operand",
|
|
|
|
|diag| {
|
|
|
|
let lsnip = snippet(cx, l.span, "...").to_string();
|
|
|
|
diag.span_suggestion(
|
|
|
|
left.span,
|
|
|
|
"use the left value directly",
|
|
|
|
lsnip,
|
|
|
|
Applicability::MaybeIncorrect, // FIXME #2597
|
|
|
|
);
|
|
|
|
},
|
2021-06-03 06:41:37 +00:00
|
|
|
);
|
2017-04-28 15:03:47 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
// foo == &bar
|
2021-04-08 15:50:13 +00:00
|
|
|
(_, &ExprKind::AddrOf(BorrowKind::Ref, _, r)) => {
|
2020-07-17 08:47:04 +00:00
|
|
|
let rty = cx.typeck_results().expr_ty(r);
|
2022-01-27 14:12:45 +00:00
|
|
|
if let Some((self_ty, other_ty)) = in_impl(cx, e, trait_id) {
|
|
|
|
let lty = cx.typeck_results().expr_ty(left);
|
|
|
|
if (are_equal(cx, rty, self_ty) && are_equal(cx, lty, other_ty))
|
|
|
|
|| (are_equal(cx, rty, other_ty) && are_equal(cx, lty, self_ty))
|
|
|
|
{
|
|
|
|
return; // Don't lint
|
|
|
|
}
|
|
|
|
}
|
2017-06-11 02:34:47 +00:00
|
|
|
let rcpy = is_copy(cx, rty);
|
2018-11-27 20:14:15 +00:00
|
|
|
if (requires_ref || rcpy)
|
2020-07-17 08:47:04 +00:00
|
|
|
&& implements_trait(cx, cx.typeck_results().expr_ty(left), trait_id, &[rty.into()])
|
2018-11-27 20:14:15 +00:00
|
|
|
{
|
2020-04-17 06:08:00 +00:00
|
|
|
span_lint_and_then(cx, OP_REF, e.span, "taken reference of right operand", |diag| {
|
2017-04-28 15:03:47 +00:00
|
|
|
let rsnip = snippet(cx, r.span, "...").to_string();
|
2020-04-17 06:08:00 +00:00
|
|
|
diag.span_suggestion(
|
2018-09-18 15:07:54 +00:00
|
|
|
right.span,
|
|
|
|
"use the right value directly",
|
|
|
|
rsnip,
|
2019-12-03 17:24:26 +00:00
|
|
|
Applicability::MaybeIncorrect, // FIXME #2597
|
2018-09-18 15:07:54 +00:00
|
|
|
);
|
2021-06-03 06:41:37 +00:00
|
|
|
});
|
2017-03-09 09:56:17 +00:00
|
|
|
}
|
2017-04-28 15:03:47 +00:00
|
|
|
},
|
|
|
|
_ => {},
|
2017-03-09 09:56:17 +00:00
|
|
|
}
|
2015-04-30 09:48:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2022-01-27 14:12:45 +00:00
|
|
|
|
2022-02-26 13:26:21 +00:00
|
|
|
fn in_impl<'tcx>(
|
|
|
|
cx: &LateContext<'tcx>,
|
|
|
|
e: &'tcx Expr<'_>,
|
|
|
|
bin_op: DefId,
|
|
|
|
) -> Option<(&'tcx rustc_hir::Ty<'tcx>, &'tcx rustc_hir::Ty<'tcx>)> {
|
2022-01-27 14:12:45 +00:00
|
|
|
if_chain! {
|
|
|
|
if let Some(block) = get_enclosing_block(cx, e.hir_id);
|
|
|
|
if let Some(impl_def_id) = cx.tcx.impl_of_method(block.hir_id.owner.to_def_id());
|
|
|
|
let item = cx.tcx.hir().expect_item(impl_def_id.expect_local());
|
|
|
|
if let ItemKind::Impl(item) = &item.kind;
|
|
|
|
if let Some(of_trait) = &item.of_trait;
|
|
|
|
if let Some(seg) = of_trait.path.segments.last();
|
|
|
|
if let Some(Res::Def(_, trait_id)) = seg.res;
|
|
|
|
if trait_id == bin_op;
|
|
|
|
if let Some(generic_args) = seg.args;
|
|
|
|
if let Some(GenericArg::Type(other_ty)) = generic_args.args.last();
|
|
|
|
|
|
|
|
then {
|
|
|
|
Some((item.self_ty, other_ty))
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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-25 03:13:38 +00:00
|
|
|
fn are_equal<'tcx>(cx: &LateContext<'tcx>, middle_ty: Ty<'_>, hir_ty: &rustc_hir::Ty<'_>) -> bool {
|
2022-01-27 14:12:45 +00:00
|
|
|
if_chain! {
|
|
|
|
if let ty::Adt(adt_def, _) = middle_ty.kind();
|
|
|
|
if let Some(local_did) = adt_def.did.as_local();
|
|
|
|
let item = cx.tcx.hir().expect_item(local_did);
|
|
|
|
let middle_ty_id = item.def_id.to_def_id();
|
|
|
|
if let TyKind::Path(QPath::Resolved(_, path)) = hir_ty.kind;
|
|
|
|
if let Res::Def(_, hir_ty_id) = path.res;
|
|
|
|
|
|
|
|
then {
|
|
|
|
hir_ty_id == middle_ty_id
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|