Skip to content

E
Exa

vnotepad / Exa

通知 1
Star 0
Fork 0
E
Exa

体验新版 GitCode，发现更多精彩内容 >>

提交 0751b009 编写于 作者: C Cristian Kubis
浏览文件
操作

updated to latest rust nightly

上级 fc188935
显示空白变更内容
内联 并排
Showing with 26 addition and 26 deletion
Cargo.lock
浏览文件 @ 0751b009
...@@ -6,7 +6,7 @@ dependencies = [ ...@@ -6,7 +6,7 @@ dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"datetime 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "datetime 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"getopts 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
"git2 0.2.8 (git+https://github.com/alexcrichton/git2-rs.git)", "git2 0.2.9 (git+https://github.com/alexcrichton/git2-rs.git)",
"locale 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "locale 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"natord 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "natord 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -32,8 +32,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -32,8 +32,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"locale 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "locale 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"pad 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "pad 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
"regex_macros 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "regex_macros 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
...@@ -51,29 +51,29 @@ dependencies = [ ...@@ -51,29 +51,29 @@ dependencies = [
[[package]] [[package]]
name = "git2" name = "git2"
version = "0.2.8" version = "0.2.9"
source = "git+https://github.com/alexcrichton/git2-rs.git#1f2cb994360df26a7a84c8ed17dd14929ba7dcd7" source = "git+https://github.com/alexcrichton/git2-rs.git#f06a248ad1bfd57e3783867b7f54c200ebc8014a"
dependencies = [ dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libgit2-sys 0.2.10 (git+https://github.com/alexcrichton/git2-rs.git)", "libgit2-sys 0.2.11 (git+https://github.com/alexcrichton/git2-rs.git)",
"url 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.1.5" version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "libgit2-sys" name = "libgit2-sys"
version = "0.2.10" version = "0.2.11"
source = "git+https://github.com/alexcrichton/git2-rs.git#1f2cb994360df26a7a84c8ed17dd14929ba7dcd7" source = "git+https://github.com/alexcrichton/git2-rs.git#f06a248ad1bfd57e3783867b7f54c200ebc8014a"
dependencies = [ dependencies = [
"libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libssh2-sys 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "libssh2-sys 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-sys 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
...@@ -87,12 +87,12 @@ dependencies = [ ...@@ -87,12 +87,12 @@ dependencies = [
[[package]] [[package]]
name = "libssh2-sys" name = "libssh2-sys"
version = "0.1.17" version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl-sys 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
...@@ -114,7 +114,7 @@ name = "log" ...@@ -114,7 +114,7 @@ name = "log"
version = "0.3.1" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
...@@ -133,7 +133,7 @@ version = "0.1.0" ...@@ -133,7 +133,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
...@@ -143,11 +143,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -143,11 +143,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "openssl-sys" name = "openssl-sys"
version = "0.5.5" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
...@@ -169,15 +169,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -169,15 +169,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "regex" name = "regex"
version = "0.1.26" version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "regex_macros" name = "regex_macros"
version = "0.1.14" version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"regex 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
...@@ -199,6 +199,6 @@ name = "users" ...@@ -199,6 +199,6 @@ name = "users"
version = "0.3.2" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
src/output/grid.rs
浏览文件 @ 0751b009
...@@ -3,7 +3,7 @@ use file::File; ...@@ -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 { ...@@ -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));
} }
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或