Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6e01157

Browse files
committedFeb 14, 2023
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
2 parents 9bb6e60 + ea679fb commit 6e01157

File tree

87 files changed

+918
-443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+918
-443
lines changed
 

‎.mailmap

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -419,18 +419,18 @@ Nixon Enraght-Moony <nixon.emoony@gmail.com>
419419
NODA Kai <nodakai@gmail.com>
420420
oliver <16816606+o752d@users.noreply.github.com>
421421
Oliver Middleton <olliemail27@gmail.com> <ollie27@users.noreply.github.com>
422-
Oliver Scherer <oliver.schneider@kit.edu> <git-spam-no-reply9815368754983@oli-obk.de>
423-
Oliver Scherer <oliver.schneider@kit.edu> <git-spam9815368754983@oli-obk.de>
424-
Oliver Scherer <oliver.schneider@kit.edu> <github333195615777966@oli-obk.de>
425-
Oliver Scherer <oliver.schneider@kit.edu> <rust19446194516@oli-obk.de>
426-
Oliver Scherer <oliver.schneider@kit.edu> <git-no-reply-9879165716479413131@oli-obk.de>
427-
Oliver Scherer <oliver.schneider@kit.edu> <git1984941651981@oli-obk.de>
428-
Oliver Scherer <oliver.schneider@kit.edu> <github35764891676564198441@oli-obk.de>
429-
Oliver Scherer <oliver.schneider@kit.edu> <github6541940@oli-obk.de>
430-
Oliver Scherer <oliver.schneider@kit.edu> <oli-obk@users.noreply.github.com>
431-
Oliver Scherer <oliver.schneider@kit.edu> <public.oliver.schneider@kit.edu>
432-
Oliver Scherer <oliver.schneider@kit.edu> <obk8176014uqher834@olio-obk.de>
433-
Oliver Scherer <oliver.schneider@kit.edu>
422+
Oliver Scherer <oli-obk@users.noreply.github.com> <git-spam-no-reply9815368754983@oli-obk.de>
423+
Oliver Scherer <oli-obk@users.noreply.github.com> <git-spam9815368754983@oli-obk.de>
424+
Oliver Scherer <oli-obk@users.noreply.github.com> <github333195615777966@oli-obk.de>
425+
Oliver Scherer <oli-obk@users.noreply.github.com> <rust19446194516@oli-obk.de>
426+
Oliver Scherer <oli-obk@users.noreply.github.com> <git-no-reply-9879165716479413131@oli-obk.de>
427+
Oliver Scherer <oli-obk@users.noreply.github.com> <git1984941651981@oli-obk.de>
428+
Oliver Scherer <oli-obk@users.noreply.github.com> <github35764891676564198441@oli-obk.de>
429+
Oliver Scherer <oli-obk@users.noreply.github.com> <github6541940@oli-obk.de>
430+
Oliver Scherer <oli-obk@users.noreply.github.com> <public.oliver.schneider@kit.edu>
431+
Oliver Scherer <oli-obk@users.noreply.github.com> <oliver.schneider@kit.edu>
432+
Oliver Scherer <oli-obk@users.noreply.github.com> <obk8176014uqher834@olio-obk.de>
433+
Oliver Scherer <oli-obk@users.noreply.github.com>
434434
Ömer Sinan Ağacan <omeragacan@gmail.com>
435435
Ophir LOJKINE <pere.jobs@gmail.com>
436436
Ožbolt Menegatti <ozbolt.menegatti@gmail.com> gareins <ozbolt.menegatti@gmail.com>

‎compiler/rustc_borrowck/src/type_check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1782,7 +1782,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
17821782
// than 1.
17831783
// If the length is larger than 1, the repeat expression will need to copy the
17841784
// element, so we require the `Copy` trait.
1785-
if len.try_eval_usize(tcx, self.param_env).map_or(true, |len| len > 1) {
1785+
if len.try_eval_target_usize(tcx, self.param_env).map_or(true, |len| len > 1) {
17861786
match operand {
17871787
Operand::Copy(..) | Operand::Constant(..) => {
17881788
// These are always okay: direct use of a const, or a value that can evidently be copied.

0 commit comments

Comments
 (0)
Please sign in to comment.