diff options
| author | bors <bors@rust-lang.org> | 2020-03-11 09:37:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-11 09:37:19 +0000 |
| commit | 303d8aff6092709edd4dbd35b1c88e9aa40bf6d8 (patch) | |
| tree | d1c781bd7041e9f7d374d93281f64d6803cbd9cd /src/libcore/ops | |
| parent | 15812785344d913d779d9738fe3cca8de56f71d5 (diff) | |
| parent | 6a8683fcd0f51eb3e17c464f9c68967c71a62de5 (diff) | |
| download | rust-303d8aff6092709edd4dbd35b1c88e9aa40bf6d8.tar.gz rust-303d8aff6092709edd4dbd35b1c88e9aa40bf6d8.zip | |
Auto merge of #69914 - Centril:rollup-wtmdinz, r=Centril
Rollup of 10 pull requests
Successful merges:
- #66059 (mem::zeroed/uninit: panic on types that do not permit zero-initialization)
- #69373 (Stabilize const for integer {to,from}_{be,le,ne}_bytes methods)
- #69591 (Use TypeRelating for instantiating query responses)
- #69625 (Implement nth, last, and count for iter::Copied)
- #69645 (const forget tests)
- #69766 (Make Point `Copy` in arithmetic documentation)
- #69825 (make `mem::discriminant` const)
- #69859 (fix #62456)
- #69891 (Exhaustiveness checking, `Matrix::push`: recursively expand or-patterns)
- #69896 (parse: Tweak the function parameter edition check)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libcore/ops')
| -rw-r--r-- | src/libcore/ops/arith.rs | 10 | ||||
| -rw-r--r-- | src/libcore/ops/mod.rs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/ops/arith.rs b/src/libcore/ops/arith.rs index 59a72799e25..e9ec81394e3 100644 --- a/src/libcore/ops/arith.rs +++ b/src/libcore/ops/arith.rs @@ -13,7 +13,7 @@ /// ``` /// use std::ops::Add; /// -/// #[derive(Debug, PartialEq)] +/// #[derive(Debug, Copy, Clone, PartialEq)] /// struct Point { /// x: i32, /// y: i32, @@ -42,7 +42,7 @@ /// ``` /// use std::ops::Add; /// -/// #[derive(Debug, PartialEq)] +/// #[derive(Debug, Copy, Clone, PartialEq)] /// struct Point<T> { /// x: T, /// y: T, @@ -115,7 +115,7 @@ add_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 } /// ``` /// use std::ops::Sub; /// -/// #[derive(Debug, PartialEq)] +/// #[derive(Debug, Copy, Clone, PartialEq)] /// struct Point { /// x: i32, /// y: i32, @@ -657,7 +657,7 @@ neg_impl_numeric! { isize i8 i16 i32 i64 i128 f32 f64 } /// ``` /// use std::ops::AddAssign; /// -/// #[derive(Debug, PartialEq)] +/// #[derive(Debug, Copy, Clone, PartialEq)] /// struct Point { /// x: i32, /// y: i32, @@ -715,7 +715,7 @@ add_assign_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 } /// ``` /// use std::ops::SubAssign; /// -/// #[derive(Debug, PartialEq)] +/// #[derive(Debug, Copy, Clone, PartialEq)] /// struct Point { /// x: i32, /// y: i32, diff --git a/src/libcore/ops/mod.rs b/src/libcore/ops/mod.rs index 77b92b6ccbd..e3e5934b44b 100644 --- a/src/libcore/ops/mod.rs +++ b/src/libcore/ops/mod.rs @@ -42,7 +42,7 @@ //! ```rust //! use std::ops::{Add, Sub}; //! -//! #[derive(Debug, PartialEq)] +//! #[derive(Debug, Copy, Clone, PartialEq)] //! struct Point { //! x: i32, //! y: i32, |
