diff options
| author | lcnr <rust@lcnr.de> | 2021-03-13 16:31:38 +0100 |
|---|---|---|
| committer | lcnr <rust@lcnr.de> | 2021-03-20 17:22:24 +0100 |
| commit | 7c9b5b4ce03c84f4c48ca39c96ff7ff20df0daad (patch) | |
| tree | 2c83d63981b6eeb7d592badb577c18d8a98205ca /src/tools/clippy | |
| parent | 43ebac119b853de626fcc9afb49c5b0544731141 (diff) | |
| download | rust-7c9b5b4ce03c84f4c48ca39c96ff7ff20df0daad.tar.gz rust-7c9b5b4ce03c84f4c48ca39c96ff7ff20df0daad.zip | |
update `const_eval_resolve`
Diffstat (limited to 'src/tools/clippy')
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/non_copy_const.rs | 10 | ||||
| -rw-r--r-- | src/tools/clippy/clippy_utils/src/consts.rs | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/tools/clippy/clippy_lints/src/non_copy_const.rs b/src/tools/clippy/clippy_lints/src/non_copy_const.rs index 8aebce67917..3e1db233696 100644 --- a/src/tools/clippy/clippy_lints/src/non_copy_const.rs +++ b/src/tools/clippy/clippy_lints/src/non_copy_const.rs @@ -181,7 +181,15 @@ fn is_value_unfrozen_expr<'tcx>(cx: &LateContext<'tcx>, hir_id: HirId, def_id: D let result = cx .tcx - .const_eval_resolve(cx.param_env, ty::WithOptConstParam::unknown(def_id), substs, None, None); + .const_eval_resolve( + cx.param_env, + ty::Unevaluated { + def: ty::WithOptConstParam::unknown(def_id), + substs, + promoted: None + }, + None + ); is_value_unfrozen_raw(cx, result, ty) } diff --git a/src/tools/clippy/clippy_utils/src/consts.rs b/src/tools/clippy/clippy_utils/src/consts.rs index 802c01055a6..ebe896b7ae8 100644 --- a/src/tools/clippy/clippy_utils/src/consts.rs +++ b/src/tools/clippy/clippy_utils/src/consts.rs @@ -341,9 +341,11 @@ impl<'a, 'tcx> ConstEvalLateContext<'a, 'tcx> { .tcx .const_eval_resolve( self.param_env, - ty::WithOptConstParam::unknown(def_id), - substs, - None, + ty::Unevaluated { + def: ty::WithOptConstParam::unknown(def_id), + substs, + promoted: None, + }, None, ) .ok() |