瀏覽代碼

Upgrade to latest version of datetime crate

- VariableOffset -> TimeZone::VariableOffset
Ben S 10 年之前
父節點
當前提交
41fb02a02d
共有 3 個文件被更改,包括 18 次插入26 次删除
  1. 13 21
      Cargo.lock
  2. 1 1
      Cargo.toml
  3. 4 4
      src/output/details.rs

+ 13 - 21
Cargo.lock

@@ -4,7 +4,7 @@ version = "0.3.0"
 dependencies = [
  "ansi_term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "datetime 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "datetime 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "git2 0.3.1 (git+https://github.com/alexcrichton/git2-rs.git)",
  "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -23,7 +23,7 @@ name = "advapi32-sys"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -55,29 +55,29 @@ name = "cmake"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "datetime"
-version = "0.2.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "locale 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "pad 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex_macros 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "tz 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "gcc"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -88,7 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "git2"
 version = "0.3.1"
-source = "git+https://github.com/alexcrichton/git2-rs.git#16d32f2468b9ff01e034d9e81578528c1a29c97e"
+source = "git+https://github.com/alexcrichton/git2-rs.git#2c0aa031ff16d4beb36e5def472423b222518fd5"
 dependencies = [
  "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -104,7 +104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "libgit2-sys"
 version = "0.3.4"
-source = "git+https://github.com/alexcrichton/git2-rs.git#16d32f2468b9ff01e034d9e81578528c1a29c97e"
+source = "git+https://github.com/alexcrichton/git2-rs.git#2c0aa031ff16d4beb36e5def472423b222518fd5"
 dependencies = [
  "cmake 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -139,7 +139,7 @@ name = "libz-sys"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -201,7 +201,7 @@ name = "openssl-sys"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -235,7 +235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -253,14 +253,6 @@ name = "regex-syntax"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "regex_macros"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rustc-serialize"
 version = "0.3.16"
@@ -335,7 +327,7 @@ dependencies = [
 
 [[package]]
 name = "winapi"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]

+ 1 - 1
Cargo.toml

@@ -9,7 +9,7 @@ name = "exa"
 [dependencies]
 ansi_term = "0.5.0"
 bitflags = "0.1"
-datetime = "0.2.0"
+datetime = "0.4.1"
 getopts = "0.2.1"
 libc = "*"
 locale = "0.1.2"

+ 4 - 4
src/output/details.rs

@@ -128,7 +128,7 @@ use ansi_term::{ANSIString, ANSIStrings, Style};
 
 use datetime::local::{LocalDateTime, DatePiece};
 use datetime::format::{DateFormat};
-use datetime::zoned::{VariableOffset, TimeZone};
+use datetime::zoned::{TimeZone};
 
 use locale;
 
@@ -381,7 +381,7 @@ pub struct Table<U> {
 
     time:         locale::Time,
     numeric:      locale::Numeric,
-    tz:           VariableOffset,
+    tz:           TimeZone,
     users:        U,
     colours:      Colours,
     current_year: i64,
@@ -394,7 +394,7 @@ impl Default for Table<MockUsers> {
             rows:    Vec::new(),
             time:    locale::Time::english(),
             numeric: locale::Numeric::english(),
-            tz:      VariableOffset::localtime().unwrap(),
+            tz:      TimeZone::localtime().unwrap(),
             users:   MockUsers::with_current_uid(0),
             colours: Colours::default(),
             current_year: 1234,
@@ -413,7 +413,7 @@ impl Table<OSUsers> {
 
             time:         locale::Time::load_user_locale().unwrap_or_else(|_| locale::Time::english()),
             numeric:      locale::Numeric::load_user_locale().unwrap_or_else(|_| locale::Numeric::english()),
-            tz:           VariableOffset::localtime().unwrap(),
+            tz:           TimeZone::localtime().unwrap(),
             users:        OSUsers::empty_cache(),
             colours:      colours,
             current_year: LocalDateTime::now().year(),