about summary refs log tree commit diff
path: root/compiler/rustc_mir_transform/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-02-14 17:24:31 +0000
committerbors <bors@rust-lang.org>2023-02-14 17:24:31 +0000
commit6e0115778b0aedc90b59e035476c38e1b8c5c29b (patch)
tree5461b07994f93625a35616a44d62aa080eaeb2fd /compiler/rustc_mir_transform/src
parent9bb6e60d1f1360234aae90c97964c0fa5524f141 (diff)
parentea679fb674f3bb86903f5b6175f7f1a692f784d9 (diff)
downloadrust-6e0115778b0aedc90b59e035476c38e1b8c5c29b.tar.gz
rust-6e0115778b0aedc90b59e035476c38e1b8c5c29b.zip
Auto merge of #108052 - matthiaskrgr:rollup-p6r6rnl, r=matthiaskrgr
Rollup of 10 pull requests

Successful merges:

 - #103478 ( Suggest fix for misplaced generic params on fn item #103366 )
 - #107739 (Check for overflow in evaluate_canonical_goal)
 - #108003 (Avoid ICE when the generic_span is empty)
 - #108016 ("Basic usage" is redundant for there is just one example)
 - #108023 (Shrink size of array benchmarks)
 - #108024 (add message to update Cargo.toml when x is changed)
 - #108025 (rustdoc: add more tooltips to intra-doc links)
 - #108029 (s/eval_usize/eval_target_usize/ for clarity)
 - #108035 (Avoid using a dead email address as the main email address)
 - #108038 (Remove needless supertrait constraints from Interner projections)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src')
-rw-r--r--compiler/rustc_mir_transform/src/generator.rs2
-rw-r--r--compiler/rustc_mir_transform/src/large_enums.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/generator.rs b/compiler/rustc_mir_transform/src/generator.rs
index 47f9d35a4f7..35c6037fa29 100644
--- a/compiler/rustc_mir_transform/src/generator.rs
+++ b/compiler/rustc_mir_transform/src/generator.rs
@@ -1845,7 +1845,7 @@ fn check_must_not_suspend_ty<'tcx>(
                 param_env,
                 SuspendCheckData {
                     descr_pre,
-                    plural_len: len.try_eval_usize(tcx, param_env).unwrap_or(0) as usize + 1,
+                    plural_len: len.try_eval_target_usize(tcx, param_env).unwrap_or(0) as usize + 1,
                     ..data
                 },
             )
diff --git a/compiler/rustc_mir_transform/src/large_enums.rs b/compiler/rustc_mir_transform/src/large_enums.rs
index 89f8de23583..194c41c6ba1 100644
--- a/compiler/rustc_mir_transform/src/large_enums.rs
+++ b/compiler/rustc_mir_transform/src/large_enums.rs
@@ -143,7 +143,7 @@ impl EnumSizeOpt {
 
                     let tmp_ty = tcx.mk_ty(ty::Array(
                         tcx.types.usize,
-                        Const::from_usize(tcx, num_variants as u64),
+                        Const::from_target_usize(tcx, num_variants as u64),
                     ));
 
                     let size_array_local = local_decls.push(LocalDecl::new(tmp_ty, span));