diff --git a/src/interval.rs b/src/interval.rs index a7c826a..b3f578a 100644 --- a/src/interval.rs +++ b/src/interval.rs @@ -191,13 +191,13 @@ where /// /// assert_ne!(interval1, interval2) /// ``` -pub fn ui(x: I) -> Interval +pub fn ui(end: I) -> Interval where I: PointType, { let interval = Interval { start: I::MIN, - end: x, + end, }; invalid_interval_panic(interval); @@ -220,13 +220,13 @@ where /// /// assert_ne!(interval1, interval2) /// ``` -pub fn ue(x: I) -> Interval +pub fn ue(end: I) -> Interval where I: PointType, { let interval = Interval { start: I::MIN, - end: x.down().unwrap(), + end: end.down().unwrap(), }; invalid_interval_panic(interval); @@ -249,12 +249,12 @@ where /// /// assert_ne!(interval1, interval2) /// ``` -pub fn iu(x: I) -> Interval +pub fn iu(start: I) -> Interval where I: PointType, { let interval = Interval { - start: x, + start, end: I::MAX, }; @@ -278,12 +278,12 @@ where /// /// assert_ne!(interval1, interval2) /// ``` -pub fn eu(x: I) -> Interval +pub fn eu(start: I) -> Interval where I: PointType, { let interval = Interval { - start: x.up().unwrap(), + start: start.up().unwrap(), end: I::MAX, }; @@ -307,11 +307,11 @@ where /// /// assert_ne!(interval1, interval2) /// ``` -pub fn ii(x1: I, x2: I) -> Interval +pub fn ii(start: I, end: I) -> Interval where I: PointType, { - let interval = Interval { start: x1, end: x2 }; + let interval = Interval { start, end }; invalid_interval_panic(interval); @@ -333,13 +333,13 @@ where /// /// assert_ne!(interval1, interval2) /// ``` -pub fn ie(x1: I, x2: I) -> Interval +pub fn ie(start: I, end: I) -> Interval where I: PointType, { let interval = Interval { - start: x1, - end: x2.down().unwrap(), + start, + end: end.down().unwrap(), }; invalid_interval_panic(interval); @@ -362,13 +362,13 @@ where /// /// assert_ne!(interval1, interval2) /// ``` -pub fn ei(x1: I, x2: I) -> Interval +pub fn ei(start: I, end: I) -> Interval where I: PointType, { let interval = Interval { - start: x1.up().unwrap(), - end: x2, + start: start.up().unwrap(), + end, }; invalid_interval_panic(interval); @@ -391,13 +391,13 @@ where /// /// assert_ne!(interval1, interval2) /// ``` -pub fn ee(x1: I, x2: I) -> Interval +pub fn ee(start: I, end: I) -> Interval where I: PointType, { let interval = Interval { - start: x1.up().unwrap(), - end: x2.down().unwrap(), + start: start.up().unwrap(), + end: end.down().unwrap(), }; invalid_interval_panic(interval);