diff options
author | Chih-Hung Hsieh <chh@google.com> | 2020-10-26 23:34:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-26 23:34:22 +0000 |
commit | 1155f2ebb9693ce204d7559a2c346e5ccee936dd (patch) | |
tree | 2f2e247d971d04be02491ca39a4bc29b7fc55224 | |
parent | 5f2953c9a6c5d96f1a98d21ce6b8da0cf6065ab9 (diff) | |
parent | ec7f2af74a3f95b80b0cfc6a33aff7c86482a244 (diff) | |
download | instant-1155f2ebb9693ce204d7559a2c346e5ccee936dd.tar.gz |
Upgrade rust/crates/instant to 0.1.8 am: b7247eb82c am: 34818560f5 am: 26041ccd7a am: ec7f2af74a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/instant/+/1474956
Change-Id: I0e640b70ac1cda1721cd5e2c4fa92ea2a8a94812
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 2 | ||||
-rw-r--r-- | Cargo.toml | 8 | ||||
-rw-r--r-- | Cargo.toml.orig | 41 | ||||
-rw-r--r-- | METADATA | 6 |
5 files changed, 50 insertions, 9 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index bb7745e..cd27d63 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "96feb8a208a8a7cd3c2d09afba3ba236821ba57b" + "sha1": "3819881b22c13652f3d625f6e7668ccfb2bd27bd" } } @@ -12,4 +12,4 @@ rust_library { } // dependent_library ["feature_list"] -// cfg-if-0.1.10 +// cfg-if-1.0.0 @@ -13,7 +13,7 @@ [package] edition = "2018" name = "instant" -version = "0.1.7" +version = "0.1.8" authors = ["sebcrozet <developer@crozet.re>"] description = "A partial replacement for std::time::Instant that works on WASM too." readme = "README.md" @@ -21,9 +21,9 @@ keywords = ["time", "wasm"] license = "BSD-3-Clause" repository = "https://github.com/sebcrozet/instant" [dependencies.cfg-if] -version = "0.1" +version = "1.0" [dev-dependencies.wasm-bindgen-test] -version = "0.2" +version = "0.3" [features] now = ["time"] @@ -46,7 +46,7 @@ version = "0.3" features = ["Window", "Performance", "PerformanceTiming"] optional = true [target."cfg(not(any(feature = \"stdweb\", feature = \"wasm-bindgen\")))".dependencies.time] -version = "0.1" +version = "0.2" optional = true [target.wasm32-unknown-emscripten.dependencies.js-sys] version = "0.3" diff --git a/Cargo.toml.orig b/Cargo.toml.orig new file mode 100644 index 0000000..8a7047e --- /dev/null +++ b/Cargo.toml.orig @@ -0,0 +1,41 @@ +[package] +name = "instant" +version = "0.1.8" +authors = ["sebcrozet <developer@crozet.re>"] +description = "A partial replacement for std::time::Instant that works on WASM too." +repository = "https://github.com/sebcrozet/instant" +readme = "README.md" +license = "BSD-3-Clause" +keywords = [ "time", "wasm" ] +edition = "2018" + +[features] +now = [ "time" ] +wasm-bindgen = ["js-sys", "wasm-bindgen_rs", "web-sys"] + +[dependencies] +cfg-if = "1.0" + +[target.'cfg(not(any(feature = "stdweb", feature = "wasm-bindgen")))'.dependencies] +time = { version = "0.2", optional = true } + +[target.wasm32-unknown-unknown.dependencies] +js-sys = { version = "0.3", optional = true } +stdweb = { version = "0.4", optional = true } +wasm-bindgen_rs = { package = "wasm-bindgen", version = "0.2", optional = true } +web-sys = { version = "0.3", optional = true, features = ['Window', 'Performance', 'PerformanceTiming'] } + +[target.wasm32-unknown-emscripten.dependencies] +js-sys = { version = "0.3", optional = true } +stdweb = { version = "0.4", optional = true } +wasm-bindgen_rs = { package = "wasm-bindgen", version = "0.2", optional = true } +web-sys = { version = "0.3", optional = true, features = ['Window', 'Performance', 'PerformanceTiming'] } + +[target.asmjs-unknown-emscripten.dependencies] +js-sys = { version = "0.3", optional = true } +stdweb = { version = "0.4", optional = true } +wasm-bindgen_rs = { package = "wasm-bindgen", version = "0.2", optional = true } +web-sys = { version = "0.3", optional = true, features = ['Window', 'Performance', 'PerformanceTiming'] } + +[dev-dependencies] +wasm-bindgen-test = "0.3" @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/instant/instant-0.1.7.crate" + value: "https://static.crates.io/crates/instant/instant-0.1.8.crate" } - version: "0.1.7" + version: "0.1.8" license_type: NOTICE last_upgrade_date { year: 2020 month: 10 - day: 20 + day: 26 } } |