Rollup merge of rust-lang#67915 - lzutao:Self, r=Centril

Dylan-DPC · web-flow · commit 34716a31db93 · 2020-01-06T12:00:23.000+05:30
Use Self instead of $type r? @Dylan-DPC
diff --git a/src/libcore/convert/num.rs b/src/libcore/convert/num.rs
@@ -47,8 +47,8 @@ macro_rules! impl_from {
         #[doc = $doc]
         impl From<$Small> for $Large {
             #[inline]
-            fn from(small: $Small) -> $Large {
-                small as $Large
+            fn from(small: $Small) -> Self {
+                small as Self
             }
         }
     };
@@ -177,7 +177,7 @@ macro_rules! try_from_unbounded {
             /// is outside of the range of the target type.
             #[inline]
             fn try_from(value: $source) -> Result<Self, Self::Error> {
-                Ok(value as $target)
+                Ok(value as Self)
             }
         }
     )*}
@@ -194,9 +194,9 @@ macro_rules! try_from_lower_bounded {
             /// number type. This returns an error if the source value
             /// is outside of the range of the target type.
             #[inline]
-            fn try_from(u: $source) -> Result<$target, TryFromIntError> {
+            fn try_from(u: $source) -> Result<Self, Self::Error> {
                 if u >= 0 {
-                    Ok(u as $target)
+                    Ok(u as Self)
                 } else {
                     Err(TryFromIntError(()))
                 }
@@ -216,11 +216,11 @@ macro_rules! try_from_upper_bounded {
             /// number type. This returns an error if the source value
             /// is outside of the range of the target type.
             #[inline]
-            fn try_from(u: $source) -> Result<$target, TryFromIntError> {
-                if u > (<$target>::max_value() as $source) {
+            fn try_from(u: $source) -> Result<Self, Self::Error> {
+                if u > (Self::max_value() as $source) {
                     Err(TryFromIntError(()))
                 } else {
-                    Ok(u as $target)
+                    Ok(u as Self)
                 }
             }
         }
@@ -238,13 +238,13 @@ macro_rules! try_from_both_bounded {
             /// number type. This returns an error if the source value
             /// is outside of the range of the target type.
             #[inline]
-            fn try_from(u: $source) -> Result<$target, TryFromIntError> {
-                let min = <$target>::min_value() as $source;
-                let max = <$target>::max_value() as $source;
+            fn try_from(u: $source) -> Result<Self, Self::Error> {
+                let min = Self::min_value() as $source;
+                let max = Self::max_value() as $source;
                 if u < min || u > max {
                     Err(TryFromIntError(()))
                 } else {
-                    Ok(u as $target)
+                    Ok(u as Self)
                 }
             }
         }
@@ -385,10 +385,10 @@ macro_rules! nzint_impl_from {
         #[doc = $doc]
         impl From<$Small> for $Large {
             #[inline]
-            fn from(small: $Small) -> $Large {
+            fn from(small: $Small) -> Self {
                 // SAFETY: input type guarantees the value is non-zero
                 unsafe {
-                    <$Large>::new_unchecked(small.get().into())
+                    Self::new_unchecked(small.get().into())
                 }
             }
         }
diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs
@@ -24,8 +24,8 @@ trait Int:
 
 macro_rules! doit {
     ($($t:ident)*) => ($(impl Int for $t {
-        fn zero() -> $t { 0 }
-        fn from_u8(u: u8) -> $t { u as $t }
+        fn zero() -> Self { 0 }
+        fn from_u8(u: u8) -> Self { u as Self }
         fn to_u8(&self) -> u8 { *self as u8 }
         fn to_u16(&self) -> u16 { *self as u16 }
         fn to_u32(&self) -> u32 { *self as u32 }
diff --git a/src/libcore/iter/traits/accum.rs b/src/libcore/iter/traits/accum.rs
@@ -44,28 +44,28 @@ macro_rules! integer_sum_product {
     (@impls $zero:expr, $one:expr, #[$attr:meta], $($a:ty)*) => ($(
         #[$attr]
         impl Sum for $a {
-            fn sum<I: Iterator<Item=$a>>(iter: I) -> $a {
+            fn sum<I: Iterator<Item=Self>>(iter: I) -> Self {
                 iter.fold($zero, Add::add)
             }
         }
 
         #[$attr]
         impl Product for $a {
-            fn product<I: Iterator<Item=$a>>(iter: I) -> $a {
+            fn product<I: Iterator<Item=Self>>(iter: I) -> Self {
                 iter.fold($one, Mul::mul)
             }
         }
 
         #[$attr]
         impl<'a> Sum<&'a $a> for $a {
-            fn sum<I: Iterator<Item=&'a $a>>(iter: I) -> $a {
+            fn sum<I: Iterator<Item=&'a Self>>(iter: I) -> Self {
                 iter.fold($zero, Add::add)
             }
         }
 
         #[$attr]
         impl<'a> Product<&'a $a> for $a {
-            fn product<I: Iterator<Item=&'a $a>>(iter: I) -> $a {
+            fn product<I: Iterator<Item=&'a Self>>(iter: I) -> Self {
                 iter.fold($one, Mul::mul)
             }
         }
@@ -84,28 +84,28 @@ macro_rules! float_sum_product {
     ($($a:ident)*) => ($(
         #[stable(feature = "iter_arith_traits", since = "1.12.0")]
         impl Sum for $a {
-            fn sum<I: Iterator<Item=$a>>(iter: I) -> $a {
+            fn sum<I: Iterator<Item=Self>>(iter: I) -> Self {
                 iter.fold(0.0, Add::add)
             }
         }
 
         #[stable(feature = "iter_arith_traits", since = "1.12.0")]
         impl Product for $a {
-            fn product<I: Iterator<Item=$a>>(iter: I) -> $a {
+            fn product<I: Iterator<Item=Self>>(iter: I) -> Self {
                 iter.fold(1.0, Mul::mul)
             }
         }
 
         #[stable(feature = "iter_arith_traits", since = "1.12.0")]
         impl<'a> Sum<&'a $a> for $a {
-            fn sum<I: Iterator<Item=&'a $a>>(iter: I) -> $a {
+            fn sum<I: Iterator<Item=&'a Self>>(iter: I) -> Self {
                 iter.fold(0.0, Add::add)
             }
         }
 
         #[stable(feature = "iter_arith_traits", since = "1.12.0")]
         impl<'a> Product<&'a $a> for $a {
-            fn product<I: Iterator<Item=&'a $a>>(iter: I) -> $a {
+            fn product<I: Iterator<Item=&'a Self>>(iter: I) -> Self {
                 iter.fold(1.0, Mul::mul)
             }
         }
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
@@ -505,15 +505,15 @@ macro_rules! impls {
 
         #[stable(feature = "rust1", since = "1.0.0")]
         impl<T: ?Sized> Clone for $t<T> {
-            fn clone(&self) -> $t<T> {
-                $t
+            fn clone(&self) -> Self {
+                Self
             }
         }
 
         #[stable(feature = "rust1", since = "1.0.0")]
         impl<T: ?Sized> Default for $t<T> {
-            fn default() -> $t<T> {
-                $t
+            fn default() -> Self {
+                Self
             }
         }
 
diff --git a/src/libcore/num/bignum.rs b/src/libcore/num/bignum.rs
@@ -455,8 +455,8 @@ macro_rules! define_bignum {
         }
 
         impl crate::clone::Clone for $name {
-            fn clone(&self) -> $name {
-                $name { size: self.size, base: self.base }
+            fn clone(&self) -> Self {
+                Self { size: self.size, base: self.base }
             }
         }
 
diff --git a/src/test/ui/issues/issue-8460.rs b/src/test/ui/issues/issue-8460.rs
@@ -11,8 +11,8 @@ trait Int {
 }
 macro_rules! doit {
     ($($t:ident)*) => ($(impl Int for $t {
-        fn zero() -> $t { 0 }
-        fn one() -> $t { 1 }
+        fn zero() -> Self { 0 }
+        fn one() -> Self { 1 }
     })*)
 }
 doit! { i8 i16 i32 i64 isize }

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ macro_rules! impl_from {`
`47`	`47`	`#[doc = $doc]`
`48`	`48`	`impl From<$Small> for $Large {`
`49`	`49`	`#[inline]`
`50`		`- fn from(small: $Small) -> $Large {`
`51`		`- small as $Large`
	`50`	`+ fn from(small: $Small) -> Self {`
	`51`	`+ small as Self`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`};`
`@@ -177,7 +177,7 @@ macro_rules! try_from_unbounded {`
`177`	`177`	`/// is outside of the range of the target type.`
`178`	`178`	`#[inline]`
`179`	`179`	`fn try_from(value: $source) -> Result<Self, Self::Error> {`
`180`		`- Ok(value as $target)`
	`180`	`+ Ok(value as Self)`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`	`)*}`
`@@ -194,9 +194,9 @@ macro_rules! try_from_lower_bounded {`
`194`	`194`	`/// number type. This returns an error if the source value`
`195`	`195`	`/// is outside of the range of the target type.`
`196`	`196`	`#[inline]`
`197`		`- fn try_from(u: $source) -> Result<$target, TryFromIntError> {`
	`197`	`+ fn try_from(u: $source) -> Result<Self, Self::Error> {`
`198`	`198`	`if u >= 0 {`
`199`		`- Ok(u as $target)`
	`199`	`+ Ok(u as Self)`
`200`	`200`	`} else {`
`201`	`201`	`Err(TryFromIntError(()))`
`202`	`202`	`}`
`@@ -216,11 +216,11 @@ macro_rules! try_from_upper_bounded {`
`216`	`216`	`/// number type. This returns an error if the source value`
`217`	`217`	`/// is outside of the range of the target type.`
`218`	`218`	`#[inline]`
`219`		`- fn try_from(u: $source) -> Result<$target, TryFromIntError> {`
`220`		`- if u > (<$target>::max_value() as $source) {`
	`219`	`+ fn try_from(u: $source) -> Result<Self, Self::Error> {`
	`220`	`+ if u > (Self::max_value() as $source) {`
`221`	`221`	`Err(TryFromIntError(()))`
`222`	`222`	`} else {`
`223`		`- Ok(u as $target)`
	`223`	`+ Ok(u as Self)`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`	`}`
`@@ -238,13 +238,13 @@ macro_rules! try_from_both_bounded {`
`238`	`238`	`/// number type. This returns an error if the source value`
`239`	`239`	`/// is outside of the range of the target type.`
`240`	`240`	`#[inline]`
`241`		`- fn try_from(u: $source) -> Result<$target, TryFromIntError> {`
`242`		`- let min = <$target>::min_value() as $source;`
`243`		`- let max = <$target>::max_value() as $source;`
	`241`	`+ fn try_from(u: $source) -> Result<Self, Self::Error> {`
	`242`	`+ let min = Self::min_value() as $source;`
	`243`	`+ let max = Self::max_value() as $source;`
`244`	`244`	`if u < min \|\| u > max {`
`245`	`245`	`Err(TryFromIntError(()))`
`246`	`246`	`} else {`
`247`		`- Ok(u as $target)`
	`247`	`+ Ok(u as Self)`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`	`}`
`@@ -385,10 +385,10 @@ macro_rules! nzint_impl_from {`
`385`	`385`	`#[doc = $doc]`
`386`	`386`	`impl From<$Small> for $Large {`
`387`	`387`	`#[inline]`
`388`		`- fn from(small: $Small) -> $Large {`
	`388`	`+ fn from(small: $Small) -> Self {`
`389`	`389`	`// SAFETY: input type guarantees the value is non-zero`
`390`	`390`	`unsafe {`
`391`		`- <$Large>::new_unchecked(small.get().into())`
	`391`	`+ Self::new_unchecked(small.get().into())`
`392`	`392`	`}`
`393`	`393`	`}`
`394`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,28 +44,28 @@ macro_rules! integer_sum_product {`
`44`	`44`	`(@impls $zero:expr, $one:expr, #[$attr:meta], $($a:ty)*) => ($(`
`45`	`45`	`#[$attr]`
`46`	`46`	`impl Sum for $a {`
`47`		`- fn sum<I: Iterator<Item=$a>>(iter: I) -> $a {`
	`47`	`+ fn sum<I: Iterator<Item=Self>>(iter: I) -> Self {`
`48`	`48`	`iter.fold($zero, Add::add)`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`#[$attr]`
`53`	`53`	`impl Product for $a {`
`54`		`- fn product<I: Iterator<Item=$a>>(iter: I) -> $a {`
	`54`	`+ fn product<I: Iterator<Item=Self>>(iter: I) -> Self {`
`55`	`55`	`iter.fold($one, Mul::mul)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`#[$attr]`
`60`	`60`	`impl<'a> Sum<&'a $a> for $a {`
`61`		`- fn sum<I: Iterator<Item=&'a $a>>(iter: I) -> $a {`
	`61`	`+ fn sum<I: Iterator<Item=&'a Self>>(iter: I) -> Self {`
`62`	`62`	`iter.fold($zero, Add::add)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`#[$attr]`
`67`	`67`	`impl<'a> Product<&'a $a> for $a {`
`68`		`- fn product<I: Iterator<Item=&'a $a>>(iter: I) -> $a {`
	`68`	`+ fn product<I: Iterator<Item=&'a Self>>(iter: I) -> Self {`
`69`	`69`	`iter.fold($one, Mul::mul)`
`70`	`70`	`}`
`71`	`71`	`}`
`@@ -84,28 +84,28 @@ macro_rules! float_sum_product {`
`84`	`84`	`($($a:ident)*) => ($(`
`85`	`85`	`#[stable(feature = "iter_arith_traits", since = "1.12.0")]`
`86`	`86`	`impl Sum for $a {`
`87`		`- fn sum<I: Iterator<Item=$a>>(iter: I) -> $a {`
	`87`	`+ fn sum<I: Iterator<Item=Self>>(iter: I) -> Self {`
`88`	`88`	`iter.fold(0.0, Add::add)`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`#[stable(feature = "iter_arith_traits", since = "1.12.0")]`
`93`	`93`	`impl Product for $a {`
`94`		`- fn product<I: Iterator<Item=$a>>(iter: I) -> $a {`
	`94`	`+ fn product<I: Iterator<Item=Self>>(iter: I) -> Self {`
`95`	`95`	`iter.fold(1.0, Mul::mul)`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`#[stable(feature = "iter_arith_traits", since = "1.12.0")]`
`100`	`100`	`impl<'a> Sum<&'a $a> for $a {`
`101`		`- fn sum<I: Iterator<Item=&'a $a>>(iter: I) -> $a {`
	`101`	`+ fn sum<I: Iterator<Item=&'a Self>>(iter: I) -> Self {`
`102`	`102`	`iter.fold(0.0, Add::add)`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`#[stable(feature = "iter_arith_traits", since = "1.12.0")]`
`107`	`107`	`impl<'a> Product<&'a $a> for $a {`
`108`		`- fn product<I: Iterator<Item=&'a $a>>(iter: I) -> $a {`
	`108`	`+ fn product<I: Iterator<Item=&'a Self>>(iter: I) -> Self {`
`109`	`109`	`iter.fold(1.0, Mul::mul)`
`110`	`110`	`}`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -505,15 +505,15 @@ macro_rules! impls {`
`505`	`505`
`506`	`506`	`#[stable(feature = "rust1", since = "1.0.0")]`
`507`	`507`	`impl<T: ?Sized> Clone for $t<T> {`
`508`		`- fn clone(&self) -> $t<T> {`
`509`		`- $t`
	`508`	`+ fn clone(&self) -> Self {`
	`509`	`+ Self`
`510`	`510`	`}`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`#[stable(feature = "rust1", since = "1.0.0")]`
`514`	`514`	`impl<T: ?Sized> Default for $t<T> {`
`515`		`- fn default() -> $t<T> {`
`516`		`- $t`
	`515`	`+ fn default() -> Self {`
	`516`	`+ Self`
`517`	`517`	`}`
`518`	`518`	`}`
`519`	`519`
Original file line number	Diff line number	Diff line change
`@@ -455,8 +455,8 @@ macro_rules! define_bignum {`
`455`	`455`	`}`
`456`	`456`
`457`	`457`	`impl crate::clone::Clone for $name {`
`458`		`- fn clone(&self) -> $name {`
`459`		`- $name { size: self.size, base: self.base }`
	`458`	`+ fn clone(&self) -> Self {`
	`459`	`+ Self { size: self.size, base: self.base }`
`460`	`460`	`}`
`461`	`461`	`}`
`462`	`462`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ trait Int {`
`11`	`11`	`}`
`12`	`12`	`macro_rules! doit {`
`13`	`13`	`($($t:ident)*) => ($(impl Int for $t {`
`14`		`- fn zero() -> $t { 0 }`
`15`		`- fn one() -> $t { 1 }`
	`14`	`+ fn zero() -> Self { 0 }`
	`15`	`+ fn one() -> Self { 1 }`
`16`	`16`	`})*)`
`17`	`17`	`}`
`18`	`18`	`doit! { i8 i16 i32 i64 isize }`