File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed
Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ impl<T: AsRangedCoord + Sized> ToGroupByRange for T where T::CoordDescType: Disc
4545
4646impl < T : DiscreteRanged > DiscreteRanged for GroupBy < T > {
4747 fn size ( & self ) -> usize {
48- ( self . 0 . size ( ) + self . 1 - 1 ) / self . 1
48+ self . 0 . size ( ) . div_ceil ( self . 1 )
4949 }
5050 fn index_of ( & self , value : & Self :: ValueType ) -> Option < usize > {
5151 self . 0 . index_of ( value) . map ( |idx| idx / self . 1 )
@@ -76,7 +76,7 @@ impl<T: DiscreteRanged> Ranged for GroupBy<T> {
7676 //let logic_range: RangedCoordusize = range.into();
7777
7878 let interval =
79- ( ( range. end - range. start + hint . bold_points ( ) - 1 ) / hint. bold_points ( ) ) . max ( 1 ) ;
79+ ( range. end - range. start ) . div_ceil ( hint. bold_points ( ) ) . max ( 1 ) ;
8080 let count = ( range. end - range. start ) / interval;
8181
8282 let idx_iter = ( 0 ..hint. bold_points ( ) ) . map ( |x| x * interval) ;
@@ -85,7 +85,7 @@ impl<T: DiscreteRanged> Ranged for GroupBy<T> {
8585 let outer_ticks = idx_iter;
8686 let outer_tick_size = interval * self . 1 ;
8787 let inner_ticks_per_group = hint. max_num_points ( ) / outer_ticks. len ( ) ;
88- let inner_ticks = ( outer_tick_size + inner_ticks_per_group - 1 ) / inner_ticks_per_group ;
88+ let inner_ticks = outer_tick_size. div_ceil ( inner_ticks_per_group) ;
8989 let inner_ticks: Vec < _ > = ( 0 ..( outer_tick_size / inner_ticks) )
9090 . map ( move |x| x * inner_ticks)
9191 . collect ( ) ;
Original file line number Diff line number Diff line change @@ -769,7 +769,7 @@ impl Ranged for RangedDuration {
769769 if let Some ( period) = compute_period_per_point ( total_ns as u64 , max_points, false ) {
770770 let mut start_ns = self . 0 . num_nanoseconds ( ) . unwrap ( ) ;
771771
772- if start_ns as u64 % period > 0 {
772+ if ! ( start_ns as u64 ) . is_multiple_of ( period) {
773773 if start_ns > 0 {
774774 start_ns += period as i64 - ( start_ns % period as i64 ) ;
775775 } else {
Original file line number Diff line number Diff line change @@ -148,7 +148,7 @@ fn layout_multiline_text<'a, F: FnMut(&'a str)>(
148148
149149 let end_idx = match indices. peek ( ) {
150150 Some ( idx) => * idx,
151- None => line. bytes ( ) . len ( ) ,
151+ None => line. len ( ) ,
152152 } ;
153153
154154 Some ( & line[ start_idx..end_idx] )
You can’t perform that action at this time.
0 commit comments