Auto merge of #26315 - steveklabnik:gh26287, r=alexcrichton

bors · bors · commit 37cc79f81c62 · 2015-06-17T18:09:10.000Z
The font can make this hard to read, and we don't even strictly need the annotation, so let's just remove it Fixes #26287
diff --git a/src/doc/trpl/traits.md b/src/doc/trpl/traits.md
@@ -332,7 +332,7 @@ fn normal<T: ConvertTo<i64>>(x: &T) -> i64 {
 fn inverse<T>() -> T
         // this is using ConvertTo as if it were "ConvertFrom<i32>"
         where i32: ConvertTo<T> {
-    1i32.convert()
+    42.convert()
 }
 ```
 

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ fn normal<T: ConvertTo<i64>>(x: &T) -> i64 {`
`332`	`332`	`fn inverse<T>() -> T`
`333`	`333`	`// this is using ConvertTo as if it were "ConvertFrom<i32>"`
`334`	`334`	`where i32: ConvertTo<T> {`
`335`		`- 1i32.convert()`
	`335`	`+ 42.convert()`
`336`	`336`	`}`
`337`	`337`	```
`338`	`338`