diff options
| author | bors <bors@rust-lang.org> | 2019-06-22 17:59:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-22 17:59:05 +0000 |
| commit | d6884aedd5b8709c44c849d055d454db2f78042e (patch) | |
| tree | 43e3cfc953ef894f07826d2e3108e23141dbee3d /src | |
| parent | 4a365a29d64bec75d107214319a129ba68fc12a3 (diff) | |
| parent | ba30dcad2fd9576cade397df33d223fb07d89266 (diff) | |
| download | rust-d6884aedd5b8709c44c849d055d454db2f78042e.tar.gz rust-d6884aedd5b8709c44c849d055d454db2f78042e.zip | |
Auto merge of #61874 - jonas-schievink:remove-rem-output-default, r=Centril
Remove the default type of `Rem::Output` Associated type defaults are not yet stable, and `Rem` is the only trait that specifies a default. Let's see what breaks when it's removed. cc https://github.com/rust-lang/rust/pull/61812#issuecomment-502394566 cc @Centril @bors try
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcore/ops/arith.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 1bfb852424d..04c50329de3 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -69,7 +69,6 @@ #![feature(allow_internal_unstable)] #![feature(arbitrary_self_types)] #![feature(asm)] -#![feature(associated_type_defaults)] #![feature(bound_cloned)] #![feature(cfg_target_has_atomic)] #![feature(concat_idents)] diff --git a/src/libcore/ops/arith.rs b/src/libcore/ops/arith.rs index 8139305f530..3c009d644c6 100644 --- a/src/libcore/ops/arith.rs +++ b/src/libcore/ops/arith.rs @@ -508,7 +508,7 @@ div_impl_float! { f32 f64 } pub trait Rem<Rhs=Self> { /// The resulting type after applying the `%` operator. #[stable(feature = "rust1", since = "1.0.0")] - type Output = Self; + type Output; /// Performs the `%` operation. #[must_use] |