--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,14 +1,14 @@
[[package]]
name = "Inflector"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "adler32"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -158,17 +158,17 @@ dependencies = [
name = "bindgen"
version = "0.33.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cexpr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"clang-sys 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"which 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "binjs_meta"
@@ -421,17 +421,17 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
"scopeguard 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "crossbeam-utils"
version = "0.2.2"
@@ -575,17 +575,17 @@ name = "diff"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "docopt"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.58 (git+https://github.com/servo/serde?branch=deserialize_from_enums7)",
"strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "dtoa"
@@ -602,17 +602,17 @@ dependencies = [
[[package]]
name = "dwrote"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.58 (git+https://github.com/servo/serde?branch=deserialize_from_enums7)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "either"
@@ -780,17 +780,17 @@ dependencies = [
[[package]]
name = "geckodriver"
version = "0.20.1"
dependencies = [
"chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)",
"clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"mozprofile 0.3.0",
"mozrunner 0.6.1",
"mozversion 0.1.3",
"regex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
"webdriver 0.35.1",
@@ -974,17 +974,17 @@ source = "registry+https://github.com/ru
[[package]]
name = "js"
version = "0.1.4"
dependencies = [
"bindgen 0.33.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"mozjs_sys 0.0.0",
"num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "kernel32-sys"
@@ -1057,17 +1057,17 @@ source = "registry+https://github.com/ru
[[package]]
name = "language-tags"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "lazy_static"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "lazycell"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -1092,17 +1092,17 @@ dependencies = [
"libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
"libudev-sys 0.1.3",
]
[[package]]
name = "libudev-sys"
version = "0.1.3"
dependencies = [
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "libz-sys"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
@@ -1669,17 +1669,17 @@ dependencies = [
]
[[package]]
name = "rayon-core"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "redox_syscall"
version = "0.1.32"
@@ -1882,17 +1882,17 @@ name = "stable_deref_trait"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "string_cache"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
"precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1936,17 +1936,17 @@ dependencies = [
"cssparser 0.23.9 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
"fallible 0.0.1",
"fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"hashglobe 0.1.0",
"itertools 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
"itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"malloc_size_of 0.0.1",
"malloc_size_of_derive 0.0.1",
"matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"new-ordered-float 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"nsstring 0.1.0",
"num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2092,17 +2092,17 @@ dependencies = [
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "thread_local"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "thread_profiler"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2338,17 +2338,17 @@ dependencies = [
"core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-text 9.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dwrote 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
"freetype 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
"plane-split 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2483,17 +2483,17 @@ dependencies = [
"nsstring 0.1.0",
"xpcom 0.1.0",
]
[[package]]
name = "xpcom_macros"
version = "0.1.0"
dependencies = [
- "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "yaml-rust"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2612,17 +2612,17 @@ dependencies = [
"checksum itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c069bbec61e1ca5a596166e55dfe4773ff745c3d16b700013bcaff9a6df2c682"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum khronos_api 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "037ab472c33f67b5fbd3e9163a2645319e5356fcd355efa6d4eb7fff4bbcb554"
"checksum lalrpop 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88035943c3cfbb897a499a556212b2b053574f32b4238b71b61625bc470f80aa"
"checksum lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cc4fd87be4a815fd373e02773983940f0d75fb26fde8c098e9e45f7af03154c0"
"checksum lalrpop-snap 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f244285324e4e33d486910b66fd3b7cb37e2072c5bf63319f506fe99ed72650"
"checksum lalrpop-util 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "de408fd50dea8ad7a77107144983a25c7fdabf5f8faf707a6e020d68874ed06c"
"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
-"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
+"checksum lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e6412c5e2ad9584b0b8e979393122026cdd6d2a80b933f890dcd694ddbe73739"
"checksum lazycell 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce12306c4739d86ee97c23139f3a34ddf0387bbf181bc7929d287025a8c3ef6b"
"checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff"
"checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2"
"checksum libudev 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea626d3bdf40a1c5aee3bcd4f40826970cae8d80a8fec934c82a63840094dcfe"
"checksum libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd64ef8ee652185674455c1d450b83cbc8ad895625d543b5324d923f82e4d8"
"checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e"
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
--- a/third_party/rust/lazy_static/.cargo-checksum.json
+++ b/third_party/rust/lazy_static/.cargo-checksum.json
@@ -1,1 +1,1 @@
-{"files":{".travis.yml":"a1cad0121fd4c6507c8b709fee344367ea73eff40915c2fd6a6108762c84f8f2","Cargo.toml":"948510703c4dff2463a2d627d5b8a66d07feafa2b81f4bf7f64dd358d0965ec7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0621878e61f0d0fda054bcbe02df75192c28bde1ecc8289cbd86aeba2dd72720","README.md":"7daae430cf5936e151386856293024e1466cddf62f27a9ff7ee3ef1511698514","appveyor.yml":"68c8ff7090ffdfa42b3d65b841d5de67d47a2206e02bf97aaca34b4500ae4bf1","src/core_lazy.rs":"f20f2fc2bb751cf74622b05ec44675b6a29bfaa67d91a2e55485c665647d2904","src/lazy.rs":"a62cc96b7177a68b25e993592b08a6c706e9020fd565a55afa1fb657efa4052c","src/lib.rs":"7bb7cc7c3f7691f53ce7a6b61c442ffa84472a0b58713e56cf7e044d41c14c6a","src/nightly_lazy.rs":"f930f393f1d35de3336d7f3b554dd54420c8d9fad195ca99ff5a6f91b15e4e7e","tests/compile-fail/README.md":"296216a459b7bf9947ba540c94b71a48ec90c2632ef5f05248a01dc8611ae149","tests/compile-fail/incorrect_visibility_restriction.rs":"557c94f781d6a2fb6c4be32a2ea252752195ff7b7c889581d95c39f2ce45e7d3","tests/compile-fail/static_is_private.rs":"f778f0759529b2dc8360f9abad1e09ea6662493493d707b3fba6cb1cb3d94af2","tests/compile-fail/static_is_sized.rs":"3b6d632f764ccee5fbd413324d7daeb2ab52dec0c99ea1db11a7eb2bbcad37cb","tests/compile-fail/static_never_used.rs":"5139e2459b4c68b0ed3f5a04452f60895b076acb1b5f344fb6b8ccbd50283a2d","tests/compile_tests.rs":"5710b2c0edc7623b895d67c26180a6c1d4022c154ecd616fab449afc9ba95109","tests/no_std.rs":"2a5236bd3892a253855b4dc192f63138239165fa23b9c3421a9faa5482c780aa","tests/test.rs":"12b100f4790037ca049692d896114d6361373c5321c29e0032c290ee39f1042c"},"package":"c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"}
\ No newline at end of file
+{"files":{".travis.yml":"3d2850edddf49a13c2b0f725ae0e0beeef9f0ee02754594db4ba5bcc64eb0900","Cargo.toml":"64e1cd36c70ec172cab7e96c5faa3c670f9313f677c90db977224f9b24a7d468","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0621878e61f0d0fda054bcbe02df75192c28bde1ecc8289cbd86aeba2dd72720","README.md":"7daae430cf5936e151386856293024e1466cddf62f27a9ff7ee3ef1511698514","appveyor.yml":"d17efb6bab4af26aa0048930de8bd3310b8d8a9961946a7962fe9fef31f96720","src/core_lazy.rs":"f20f2fc2bb751cf74622b05ec44675b6a29bfaa67d91a2e55485c665647d2904","src/lazy.rs":"a62cc96b7177a68b25e993592b08a6c706e9020fd565a55afa1fb657efa4052c","src/lib.rs":"75eee349be03ac278c1183cd861ffd0117b7ab7fffd4d46d0a1e21b9c48eab9b","src/nightly_lazy.rs":"7c00b832e907efeee16a01e1739fa536cd01b97a31d71f00d72dcabcf2e4e428","tests/no_std.rs":"2a5236bd3892a253855b4dc192f63138239165fa23b9c3421a9faa5482c780aa","tests/test.rs":"12b100f4790037ca049692d896114d6361373c5321c29e0032c290ee39f1042c"},"package":"e6412c5e2ad9584b0b8e979393122026cdd6d2a80b933f890dcd694ddbe73739"}
\ No newline at end of file
--- a/third_party/rust/lazy_static/.travis.yml
+++ b/third_party/rust/lazy_static/.travis.yml
@@ -1,31 +1,33 @@
language: rust
-rust:
-- nightly
-- beta
-- stable
-before_script:
-- |
- pip install 'travis-cargo<0.2' --user &&
- export PATH=`python -m site --user-base`/bin:$PATH
+matrix:
+ include:
+ - rust: 1.21.0
+ - rust: stable
+ - os: osx
+ - rust: beta
+ - rust: nightly
+ script:
+ - cargo test
+ - cargo bench
+ - cargo test --features nightly
+ - cargo bench --features nightly
+ - cargo test --features spin_no_std
+ - cargo bench --features spin_no_std
+ - cd compiletest
+ - cargo clean
+ - cargo test
+ - cd ../
+
+ - rust: nightly
+ before_script:
+ - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
+ script:
+ - cargo doc --no-deps --all-features
+ after_success:
+ - travis-cargo --only nightly doc-upload
script:
-- |
- travis-cargo build &&
- travis-cargo test &&
- travis-cargo bench &&
- travis-cargo --only nightly build -- --features spin_no_std &&
- travis-cargo --only nightly test -- --features spin_no_std &&
- travis-cargo --only nightly bench -- --features spin_no_std &&
- travis-cargo --only nightly clean &&
- travis-cargo --only nightly build -- --features compiletest &&
- travis-cargo --only nightly test -- --features compiletest &&
- travis-cargo --only nightly clean &&
- travis-cargo --only stable doc
-after_success:
-- travis-cargo --only stable doc-upload
+ - cargo test
+
env:
global:
- - TRAVIS_CARGO_NIGHTLY_FEATURE=nightly
- secure: YXu24LptjeYirjWYjWGsMT2m3mB7LvQATE6TVo7VEUXv8GYoy2ORIHD83PeImxC93MmZ01QeUezRzuCW51ZcK92VnNSBttlF60SvIX18VsJrV92tsAhievFstqYQ+fB8DIuQ8noU0jPz7GpI+R9dlTRSImAqWOnVIghA+Wzz7Js=
-os:
- - linux
- - osx
--- a/third_party/rust/lazy_static/Cargo.toml
+++ b/third_party/rust/lazy_static/Cargo.toml
@@ -7,35 +7,30 @@
#
# If you believe there's an error in this file please file an
# issue against the rust-lang/cargo repository. If you're
# editing this file be aware that the upstream Cargo.toml
# will likely look very different (and much more reasonable)
[package]
name = "lazy_static"
-version = "1.0.0"
+version = "1.0.1"
authors = ["Marvin Löbel <loebel.marvin@gmail.com>"]
description = "A macro for declaring lazily evaluated statics in Rust."
documentation = "https://docs.rs/lazy_static"
readme = "README.md"
keywords = ["macro", "lazy", "static"]
categories = ["no-std", "rust-patterns", "memory-management"]
license = "MIT/Apache-2.0"
repository = "https://github.com/rust-lang-nursery/lazy-static.rs"
-[dependencies.compiletest_rs]
-version = "0.3"
-optional = true
-
[dependencies.spin]
version = "0.4.6"
optional = true
[features]
-compiletest = ["compiletest_rs"]
nightly = []
spin_no_std = ["nightly", "spin"]
[badges.appveyor]
repository = "rust-lang-nursery/lazy-static.rs"
[badges.is-it-maintained-issue-resolution]
repository = "rust-lang-nursery/lazy-static.rs"
--- a/third_party/rust/lazy_static/appveyor.yml
+++ b/third_party/rust/lazy_static/appveyor.yml
@@ -48,12 +48,14 @@ install:
- cargo -V
build: false
test_script:
- cargo build --verbose
- cargo test
- if [%CHANNEL%]==[nightly] (
+ cd compiletest &&
cargo clean &&
- cargo build --verbose --features "compiletest" &&
- cargo test --features "compiletest"
+ cargo build --verbose &&
+ cargo test &&
+ cd ../
)
--- a/third_party/rust/lazy_static/src/lib.rs
+++ b/third_party/rust/lazy_static/src/lib.rs
@@ -81,34 +81,34 @@ fn main() {
println!("The map has {} entries.", *COUNT);
println!("The entry for `0` is \"{}\".", HASHMAP.get(&0).unwrap());
println!("A expensive calculation on a static results in: {}.", *NUMBER);
}
```
# Implementation details
-The `Deref` implementation uses a hidden static variable that is guarded by a atomic check on each access.
+The `Deref` implementation uses a hidden static variable that is guarded by an atomic check on each access.
# Cargo features
This crate provides two cargo features:
- `nightly`: This uses unstable language features only available on the nightly release channel for a more optimal implementation. In practice this currently means avoiding a heap allocation per static. This feature might get deprecated at a later point once all relevant optimizations are usable from stable.
- `spin_no_std` (implies `nightly`): This allows using this crate in a no-std environment, by depending on the standalone `spin` crate.
Both features depend on unstable language features, which means
no guarantees can be made about them in regard to SemVer stability.
*/
#![cfg_attr(feature="spin_no_std", feature(const_fn))]
#![cfg_attr(feature="nightly", feature(unreachable))]
-#![doc(html_root_url = "https://docs.rs/lazy_static/1.0.0")]
+#![doc(html_root_url = "https://docs.rs/lazy_static/1.0.1")]
#![no_std]
#[cfg(not(feature="nightly"))]
#[doc(hidden)]
pub mod lazy;
#[cfg(all(feature="nightly", not(feature="spin_no_std")))]
#[path="nightly_lazy.rs"]
--- a/third_party/rust/lazy_static/src/nightly_lazy.rs
+++ b/third_party/rust/lazy_static/src/nightly_lazy.rs
@@ -1,16 +1,17 @@
// Copyright 2016 lazy-static.rs Developers
//
// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
// http://opensource.org/licenses/MIT>, at your option. This file may not be
// copied, modified, or distributed except according to those terms.
extern crate std;
+extern crate core;
use self::std::prelude::v1::*;
use self::std::sync::Once;
pub use self::std::sync::ONCE_INIT;
pub struct Lazy<T: Sync>(pub Option<T>, pub Once);
impl<T: Sync> Lazy<T> {
@@ -22,17 +23,17 @@ impl<T: Sync> Lazy<T> {
let r = &mut self.0;
self.1.call_once(|| {
*r = Some(f());
});
}
unsafe {
match self.0 {
Some(ref x) => x,
- None => std::mem::unreachable(),
+ None => core::hint::unreachable_unchecked(),
}
}
}
}
unsafe impl<T: Sync> Sync for Lazy<T> {}
#[macro_export]
deleted file mode 100644
--- a/third_party/rust/lazy_static/tests/compile-fail/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-This directory contains snippets of code that should yield a
-warning/note/help/error at compilation. Syntax of annotations is described in
-[rust documentation](https://github.com/rust-lang/rust/blob/master/src/test/COMPILER_TESTS.md).
-For more information check out [`compiletest` crate](https://github.com/laumann/compiletest-rs).
-
-To run compile tests issue `cargo +nightly --test --features compiletest`.
-
-## Notes on working with `compiletest` crate
-
-* Currently code that is inside macro should not be annotated, as `compiletest`
- crate cannot deal with the fact that macro invocations effectively changes
- line numbering. To prevent this add a `// error-pattern:<your error message here>`
- on the top of the file and make sure that you set `deny` lint level
- if you want to test compiler message different than error.
-* `compiletest` crate by default sets `allow(dead_code)` lint level so make sure
- that you change it to something suiting your needs even if the warning is
- issued prior to any macro invocation.
-* If you get a message `error: 0 unexpected errors found, 1 expected errors not found`
- despite the fact that some error was bound to occur don't worry - it's a known
- issue in the `compiletest` crate and your error was probably not registered -
- make sure that your annotations are correct and that you are setting correct
- lint levels.
deleted file mode 100644
--- a/third_party/rust/lazy_static/tests/compile-fail/incorrect_visibility_restriction.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// incorrect visibility restriction
-#[macro_use]
-extern crate lazy_static;
-
-lazy_static! {
- pub(nonsense) static ref WRONG: () = ();
- //~^ ERROR incorrect visibility restriction
-}
-
-fn main() { }
deleted file mode 100644
--- a/third_party/rust/lazy_static/tests/compile-fail/static_is_private.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod outer {
- pub mod inner {
- lazy_static! {
- pub(in outer) static ref FOO: () = ();
- }
- }
-}
-
-fn main() {
- assert_eq!(*outer::inner::FOO, ()); //~ ERROR static `FOO` is private
-}
deleted file mode 100644
--- a/third_party/rust/lazy_static/tests/compile-fail/static_is_sized.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// error-pattern:the trait bound `str: std::marker::Sized` is not satisfied
-#[macro_use]
-extern crate lazy_static;
-
-lazy_static! {
- pub static ref FOO: str = panic!();
-}
-
-
-fn main() {
-}
deleted file mode 100644
--- a/third_party/rust/lazy_static/tests/compile-fail/static_never_used.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// error-pattern:static item is never used: `UNUSED`
-#![deny(dead_code)]
-#[macro_use]
-extern crate lazy_static;
-
-lazy_static! {
- static ref UNUSED: () = ();
-}
-
-fn main() { }
deleted file mode 100644
--- a/third_party/rust/lazy_static/tests/compile_tests.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-#![cfg(feature="compiletest")]
-extern crate compiletest_rs as compiletest;
-
-fn run_mode(mode: &'static str) {
- let mut config = compiletest::Config::default();
- config.mode = mode.parse().expect("Invalid mode");
- config.src_base = ["tests", mode].iter().collect();
- config.target_rustcflags = Some("-L target/debug/ -L target/debug/deps/".to_owned());
-
- config.verbose = true;
-
- compiletest::run_tests(&config);
-}
-
-#[test]
-fn compile_test() {
- run_mode("compile-fail");
-}