Auto merge of #964 - npmccallum:master, r=alexcrichton

bors · bors · commit cc835c9a76fa · 2018-04-06T18:58:53.000Z
Default RHS to Self for Div and Shl

This fixes a consistency issue with the other operator traits.
diff --git a/src/dox.rs b/src/dox.rs
@@ -68,13 +68,13 @@ mod imp {
     }
 
     #[lang = "div"]
-    pub trait Div<RHS> {
+    pub trait Div<RHS=Self> {
         type Output;
         fn div(self, rhs: RHS) -> Self::Output;
     }
 
     #[lang = "shl"]
-    pub trait Shl<RHS> {
+    pub trait Shl<RHS=Self> {
         type Output;
         fn shl(self, rhs: RHS) -> Self::Output;
     }

Original file line number	Diff line number	Diff line change
`@@ -68,13 +68,13 @@ mod imp {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`#[lang = "div"]`
`71`		`- pub trait Div<RHS> {`
	`71`	`+ pub trait Div<RHS=Self> {`
`72`	`72`	`type Output;`
`73`	`73`	`fn div(self, rhs: RHS) -> Self::Output;`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`#[lang = "shl"]`
`77`		`- pub trait Shl<RHS> {`
	`77`	`+ pub trait Shl<RHS=Self> {`
`78`	`78`	`type Output;`
`79`	`79`	`fn shl(self, rhs: RHS) -> Self::Output;`
`80`	`80`	`}`