diff options
| author | bors <bors@rust-lang.org> | 2023-06-21 08:00:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-21 08:00:23 +0000 |
| commit | 97bf23d26b1ffff46f071aa687945a6cf85a5914 (patch) | |
| tree | ea43068fe2edaeca5b4dcd64f1b48ff81bd8e1d3 /library/alloc | |
| parent | 67da586efe13aa66eef576ba095e1875ba65fd20 (diff) | |
| parent | 82e6a16e3314469e4cf8e8c65381f7a47a4d294b (diff) | |
| download | rust-97bf23d26b1ffff46f071aa687945a6cf85a5914.tar.gz rust-97bf23d26b1ffff46f071aa687945a6cf85a5914.zip | |
Auto merge of #112877 - Nilstrieb:rollup-5g5hegl, r=Nilstrieb
Rollup of 6 pull requests Successful merges: - #112632 (Implement PartialOrd for `Vec`s over different allocators) - #112759 (Make closure_saved_names_of_captured_variables a query. ) - #112772 (Add a fully fledged `Clause` type, rename old `Clause` to `ClauseKind`) - #112790 (Syntactically accept `become` expressions (explicit tail calls experiment)) - #112830 (More codegen cleanups) - #112844 (Add retag in MIR transform: `Adt` for `Unique` may contain a reference) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc')
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 289bbc7d2ef..a30c6a44e07 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -2978,9 +2978,14 @@ impl<'a, T: Copy + 'a, A: Allocator + 'a> Extend<&'a T> for Vec<T, A> { /// Implements comparison of vectors, [lexicographically](Ord#lexicographical-comparison). #[stable(feature = "rust1", since = "1.0.0")] -impl<T: PartialOrd, A: Allocator> PartialOrd for Vec<T, A> { +impl<T, A1, A2> PartialOrd<Vec<T, A2>> for Vec<T, A1> +where + T: PartialOrd, + A1: Allocator, + A2: Allocator, +{ #[inline] - fn partial_cmp(&self, other: &Self) -> Option<Ordering> { + fn partial_cmp(&self, other: &Vec<T, A2>) -> Option<Ordering> { PartialOrd::partial_cmp(&**self, &**other) } } |
