@@ -1117,55 +1117,6 @@ impl<'a, T: ?Sized> DerefMut for &'a mut T {
11171117#[ lang="fn" ]
11181118#[ unstable( feature = "core" ,
11191119 reason = "uncertain about variadic generics, input versus associated types" ) ]
1120- #[ cfg( stage0) ]
1121- pub trait Fn < Args , Output > {
1122- /// This is called when the call operator is used.
1123- extern "rust-call" fn call ( & self , args : Args ) -> Output ;
1124- }
1125-
1126- /// A version of the call operator that takes a mutable receiver.
1127- #[ lang="fn_mut" ]
1128- #[ unstable( feature = "core" ,
1129- reason = "uncertain about variadic generics, input versus associated types" ) ]
1130- #[ cfg( stage0) ]
1131- pub trait FnMut < Args , Output > {
1132- /// This is called when the call operator is used.
1133- extern "rust-call" fn call_mut ( & mut self , args : Args ) -> Output ;
1134- }
1135-
1136- /// A version of the call operator that takes a by-value receiver.
1137- #[ lang="fn_once" ]
1138- #[ unstable( feature = "core" ,
1139- reason = "uncertain about variadic generics, input versus associated types" ) ]
1140- #[ cfg( stage0) ]
1141- pub trait FnOnce < Args , Output > {
1142- /// This is called when the call operator is used.
1143- extern "rust-call" fn call_once ( self , args : Args ) -> Output ;
1144- }
1145-
1146- #[ cfg( stage0) ]
1147- impl < F : ?Sized , A , R > FnMut < A , R > for F
1148- where F : Fn < A , R >
1149- {
1150- extern "rust-call" fn call_mut ( & mut self , args : A ) -> R {
1151- self . call ( args)
1152- }
1153- }
1154-
1155- #[ cfg( stage0) ]
1156- impl < F , A , R > FnOnce < A , R > for F
1157- where F : FnMut < A , R >
1158- {
1159- extern "rust-call" fn call_once ( mut self , args : A ) -> R {
1160- self . call_mut ( args)
1161- }
1162- }
1163-
1164- /// A version of the call operator that takes an immutable receiver.
1165- #[ lang="fn" ]
1166- #[ unstable( feature = "core" ,
1167- reason = "uncertain about variadic generics, input versus associated types" ) ]
1168- #[ cfg( not( stage0) ) ]
11691120pub trait Fn < Args > {
11701121 type Output ;
11711122
@@ -1177,7 +1128,6 @@ pub trait Fn<Args> {
11771128#[ lang="fn_mut" ]
11781129#[ unstable( feature = "core" ,
11791130 reason = "uncertain about variadic generics, input versus associated types" ) ]
1180- #[ cfg( not( stage0) ) ]
11811131pub trait FnMut < Args > {
11821132 type Output ;
11831133
@@ -1189,15 +1139,13 @@ pub trait FnMut<Args> {
11891139#[ lang="fn_once" ]
11901140#[ unstable( feature = "core" ,
11911141 reason = "uncertain about variadic generics, input versus associated types" ) ]
1192- #[ cfg( not( stage0) ) ]
11931142pub trait FnOnce < Args > {
11941143 type Output ;
11951144
11961145 /// This is called when the call operator is used.
11971146 extern "rust-call" fn call_once ( self , args : Args ) -> Self :: Output ;
11981147}
11991148
1200- #[ cfg( not( stage0) ) ]
12011149impl < F : ?Sized , A > FnMut < A > for F
12021150 where F : Fn < A >
12031151{
@@ -1208,7 +1156,6 @@ impl<F: ?Sized, A> FnMut<A> for F
12081156 }
12091157}
12101158
1211- #[ cfg( not( stage0) ) ]
12121159impl < F , A > FnOnce < A > for F
12131160 where F : FnMut < A >
12141161{
0 commit comments