mirror of
https://github.com/Llewellynvdm/exa.git
synced 2025-01-29 16:48:25 +00:00
Merge pull request #57 from tsurai/master
updated to latest rust nightly
This commit is contained in:
commit
f6faca19ef
@ -3,7 +3,7 @@ use file::File;
|
|||||||
use super::lines::lines_view;
|
use super::lines::lines_view;
|
||||||
|
|
||||||
use std::cmp::max;
|
use std::cmp::max;
|
||||||
use std::iter::{AdditiveIterator, repeat};
|
use std::iter::repeat;
|
||||||
|
|
||||||
#[derive(PartialEq, Debug, Copy, Clone)]
|
#[derive(PartialEq, Debug, Copy, Clone)]
|
||||||
pub struct Grid {
|
pub struct Grid {
|
||||||
@ -55,7 +55,7 @@ impl Grid {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If they all fit in the terminal, combined, then success!
|
// If they all fit in the terminal, combined, then success!
|
||||||
if column_widths.iter().map(|&x| x).sum() < adjusted_width {
|
if column_widths.iter().map(|&x| x).sum::<usize>() < adjusted_width {
|
||||||
return Some((num_lines, column_widths));
|
return Some((num_lines, column_widths));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user