auto merge of #14316 : kballard/rust/range_inclusive_no_toprimitive, r=alexcrichton

bors · bors · commit 082075d0509e · 2014-05-21T02:46:23.000-07:00
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
@@ -2016,7 +2016,7 @@ pub struct RangeInclusive<A> {
 
 /// Return an iterator over the range [start, stop]
 #[inline]
-pub fn range_inclusive<A: Add<A, A> + Ord + Clone + One + ToPrimitive>(start: A, stop: A)
+pub fn range_inclusive<A: Add<A, A> + Ord + Clone + One>(start: A, stop: A)
     -> RangeInclusive<A> {
     RangeInclusive{range: range(start, stop), done: false}
 }

Original file line number	Diff line number	Diff line change
`@@ -2016,7 +2016,7 @@ pub struct RangeInclusive<A> {`
`2016`	`2016`
`2017`	`2017`	`/// Return an iterator over the range [start, stop]`
`2018`	`2018`	`#[inline]`
`2019`		`-pub fn range_inclusive<A: Add<A, A> + Ord + Clone + One + ToPrimitive>(start: A, stop: A)`
	`2019`	`+pub fn range_inclusive<A: Add<A, A> + Ord + Clone + One>(start: A, stop: A)`
`2020`	`2020`	`-> RangeInclusive<A> {`
`2021`	`2021`	`RangeInclusive{range: range(start, stop), done: false}`
`2022`	`2022`	`}`