diff --git a/Cargo.lock b/Cargo.lock index 3ccdeca49..8c4f0a526 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,16 +1,16 @@ [root] name = "cratesfyi" -version = "0.2.0" +version = "0.2.1" dependencies = [ - "badge 0.1.0", - "cargo 0.12.0 (git+https://github.com/rust-lang/cargo.git?rev=ffa147d393037fd5632cd8c9d048b5521d70ab4c)", - "clap 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "badge 0.1.1", + "cargo 0.13.0 (git+https://github.com/rust-lang/cargo.git?rev=c917e94b419ce62760c0a6fdcf90ff0d7d1d5cdb)", + "clap 2.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "git2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "handlebars-iron 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", "hoedown 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -23,8 +23,8 @@ dependencies = [ "router 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "sass-rs 0.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "slug 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "semver 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "slug 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "staticfile 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -50,7 +50,7 @@ dependencies = [ [[package]] name = "ansi_term" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -87,9 +87,9 @@ dependencies = [ [[package]] name = "badge" -version = "0.1.0" +version = "0.1.1" dependencies = [ - "rusttype 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rusttype 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -146,11 +146,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cargo" -version = "0.12.0" -source = "git+https://github.com/rust-lang/cargo.git?rev=ffa147d393037fd5632cd8c9d048b5521d70ab4c#ffa147d393037fd5632cd8c9d048b5521d70ab4c" +version = "0.13.0" +source = "git+https://github.com/rust-lang/cargo.git?rev=c917e94b419ce62760c0a6fdcf90ff0d7d1d5cdb#c917e94b419ce62760c0a6fdcf90ff0d7d1d5cdb" dependencies = [ "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crates-io 0.4.0 (git+https://github.com/rust-lang/cargo.git?rev=ffa147d393037fd5632cd8c9d048b5521d70ab4c)", + "crates-io 0.4.0 (git+https://github.com/rust-lang/cargo.git?rev=c917e94b419ce62760c0a6fdcf90ff0d7d1d5cdb)", "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "curl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -165,10 +165,12 @@ dependencies = [ "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "libgit2-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.7.13 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.71 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "semver 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -184,13 +186,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "clap" -version = "2.5.2" +version = "2.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "term_size 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-segmentation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "vec_map 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -225,7 +229,7 @@ dependencies = [ [[package]] name = "crates-io" version = "0.4.0" -source = "git+https://github.com/rust-lang/cargo.git?rev=ffa147d393037fd5632cd8c9d048b5521d70ab4c#ffa147d393037fd5632cd8c9d048b5521d70ab4c" +source = "git+https://github.com/rust-lang/cargo.git?rev=c917e94b419ce62760c0a6fdcf90ff0d7d1d5cdb#c917e94b419ce62760c0a6fdcf90ff0d7d1d5cdb" dependencies = [ "curl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -377,7 +381,7 @@ name = "handlebars" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "itertools 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "quick-error 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -449,7 +453,7 @@ dependencies = [ [[package]] name = "hyper" -version = "0.9.7" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -498,7 +502,7 @@ dependencies = [ [[package]] name = "itertools" -version = "0.4.15" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -581,7 +585,7 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.0.9" +version = "0.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -648,6 +652,17 @@ dependencies = [ "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "miow" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "modifier" version = "0.1.0" @@ -678,16 +693,6 @@ dependencies = [ "tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ndarray" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "itertools 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", - "num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "net2" version = "0.2.23" @@ -708,11 +713,6 @@ dependencies = [ "odds 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "nom" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "num" version = "0.1.32" @@ -1009,12 +1009,11 @@ dependencies = [ [[package]] name = "rusttype" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "linked-hash-map 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "ndarray 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "linked-hash-map 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "stb_truetype 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1043,10 +1042,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "semver" -version = "0.2.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "nom 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "semver-parser 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "semver-parser" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.71 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1070,7 +1078,7 @@ dependencies = [ [[package]] name = "slug" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unidecode 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1113,7 +1121,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "strsim" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1142,6 +1150,14 @@ dependencies = [ "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "term_size" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "thread-id" version = "2.0.0" @@ -1221,6 +1237,11 @@ name = "unicode-normalization" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "unicode-segmentation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "unicode-width" version = "0.1.3" @@ -1348,7 +1369,7 @@ dependencies = [ [metadata] "checksum advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "307c92332867e586720c0222ee9d890bbe8431711efed8a1b06bc5b40fc66bd7" "checksum aho-corasick 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2b3fb52b09c1710b961acb35390d514be82e4ac96a9969a8e38565a29b878dc9" -"checksum ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1f46cd5b1d660c938e3f92dfe7a73d832b3281479363dd0cd9c1c2fbf60f7962" +"checksum ansi_term 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c877397e09fec7a240af5fa74ad0124054b8066149d6544cd1ace93f8de3be68" "checksum arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "16e3bdb2f54b3ace0285975d59a97cf8ed3855294b2b6bc651fcf22a9c352975" "checksum backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "346d7644f0b5f9bc73082d3b2236b69a05fd35cce0cfa3724e184e6a5c9e2a2f" "checksum backtrace-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ff73785ae8e06bb4a7b09e09f06d7434f9748b86d2f67bdf334b603354497e08" @@ -1361,13 +1382,13 @@ dependencies = [ "checksum bufstream 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b48dbe2ff0e98fa2f03377d204a9637d3c9816cd431bfe05a8abbd0ea11d074" "checksum byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96c8b41881888cc08af32d47ac4edd52bc7fa27fef774be47a92443756451304" "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855" -"checksum cargo 0.12.0 (git+https://github.com/rust-lang/cargo.git?rev=ffa147d393037fd5632cd8c9d048b5521d70ab4c)" = "" +"checksum cargo 0.13.0 (git+https://github.com/rust-lang/cargo.git?rev=c917e94b419ce62760c0a6fdcf90ff0d7d1d5cdb)" = "" "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c" -"checksum clap 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96fee724ff92564914e8aa708919449e0c7b165f7833110b4b1ade9b3a9b17e8" +"checksum clap 2.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3df6dcb3122b085b96399062f4fa59d69f4d0af50519944f2d76b7a7686629e3" "checksum cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "dfcf5bcece56ef953b8ea042509e9dcbdfe97820b7e20d86beb53df30ed94978" "checksum conduit-mime-types 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "95ca30253581af809925ef68c2641cc140d6183f43e12e0af4992d53768bd7b8" "checksum cookie 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e3d6405328b6edb412158b3b7710e2634e23f3614b9bb1c412df7952489a626" -"checksum crates-io 0.4.0 (git+https://github.com/rust-lang/cargo.git?rev=ffa147d393037fd5632cd8c9d048b5521d70ab4c)" = "" +"checksum crates-io 0.4.0 (git+https://github.com/rust-lang/cargo.git?rev=c917e94b419ce62760c0a6fdcf90ff0d7d1d5cdb)" = "" "checksum crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "fb974f835e90390c5f9dfac00f05b06dc117299f5ea4e85fbc7bb443af4911cc" "checksum curl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26fa2377bacffb278a472dcc2c742577316527d2a8ce588455127c6ff4521846" "checksum curl-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "780c1e295903f12cb0598d73703f850615f685eeeb4f2323fbd2911ef337da7e" @@ -1391,10 +1412,10 @@ dependencies = [ "checksum hpack 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d2da7d3a34cf6406d9d700111b8eafafe9a251de41ae71d8052748259343b58" "checksum httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46534074dbb80b070d60a5cb8ecadd8963a00a438ae1a95268850a7ef73b67ae" "checksum hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bb0f4d00bb781e559b6e66ae4b5479df0fdf9ab15949f52fa2f1f5de16d4cc07" -"checksum hyper 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)" = "e7007ac7992a1fec4cc3a486888e8280b7b87bc8cc548a74a8634ecac1f70871" +"checksum hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "eb27e8a3e8f17ac43ffa41bbda9cf5ad3f9f13ef66fa4873409d4902310275f7" "checksum idna 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1053236e00ce4f668aeca4a769a09b3bf5a682d802abd6f3cb39374f6b162c11" "checksum iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bce8d64fae23c51acaaa737720b3dde37aeacd3d21ea73059999e0016c9673d9" -"checksum itertools 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "88f21fed5ebd96f4db04106cd37c21417393e08533d3914a42fc666f75d5064f" +"checksum itertools 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c4a9b56eb56058f43dc66e58f40a214b2ccbc9f3df51861b63d51dec7b65bc3f" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417" @@ -1405,7 +1426,7 @@ dependencies = [ "checksum libressl-pnacl-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "cbc058951ab6a3ef35ca16462d7642c4867e6403520811f28537a4e2f2db3e71" "checksum libssh2-sys 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "c45fba84ee1fa05b830cb471741ef30d41eb1c3b97160b8ad8d955af824de880" "checksum libz-sys 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c9795a8a0498b3abab873f8f063816fcc2e002388e89df87da065628dd5a8ed2" -"checksum linked-hash-map 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "83f7ff3baae999fdf921cccf54b61842bb3b26868d50d02dff48052ebec8dd79" +"checksum linked-hash-map 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "f26e961e0c884309cd527b1402a5409d35db612b36915d755e1a4f5c1547a31c" "checksum log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ab83497bf8bf4ed2a74259c1c802351fcd67a65baa86394b6ba73c36f4838054" "checksum magic 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0171890abdef5ff5e9199aa40831d71ae43f08ffb63504a9544a69e9c3e38945" "checksum magic-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "255aea8397b20a4779dea4656428f6df29d19ff4d679bcd0fac2fc3aa802ea5a" @@ -1414,13 +1435,12 @@ dependencies = [ "checksum mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a74cc2587bf97c49f3f5bab62860d6abf3902ca73b66b51d9b049fbdcd727bd2" "checksum mime_guess 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e9a7d89cb3bce9145b0d0339a0588b044e3e3e3faa1dcd74822ebdc36bfac020" "checksum miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d1f4d337a01c32e1f2122510fed46393d53ca35a7f429cb0450abaedfa3ed54" +"checksum miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d5bfc6782530ac8ace97af10a540054a37126b63b0702ddaaa243b73b5745b9a" "checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" "checksum mount 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9098630c44ff3511087d2f06889141a98d632a62d7745abb132d8e08b325dd39" "checksum multipart 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6afda429f7ebcb31c1ce8ea4c6afb2bec0b3f28b002686610b29f323e92a2731" -"checksum ndarray 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ca4cf6783555b7ad65d411e89d2955ec36248f93b0a9947edc603fb2652d85c0" "checksum net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "6a816012ca11cb47009693c1e0c6130e26d39e4d97ee2a13c50e868ec83e3204" "checksum nodrop 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ac897fe104d12461f7fc6b4f29657564796b3d05d214efcdcf417d58fceb6e7d" -"checksum nom 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d1b06a35295796400a1db7382054f93713bf3924e7c268af94c5357b9fbf4cb6" "checksum num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "c04bd954dbf96f76bab6e5bd6cef6f1ce1262d15268ce4f926d2b5b778fa7af2" "checksum num-bigint 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "41655c8d667be847a0b72fe0888857a7b3f052f691cf40852be5fcf87b274a65" "checksum num-complex 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "ccac67baf893ac97474f8d70eff7761dabb1f6c66e71f8f1c67a6859218db810" @@ -1455,23 +1475,25 @@ dependencies = [ "checksum rustc-demangle 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c4c2d35b2ed94cec4fad26a36eee4d6eff394ce70a8ceea064b0b6ca42ea4cf0" "checksum rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "6159e4e6e559c81bd706afe9c8fd68f547d3e851ce12e76b1de7914bab61691b" "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084" -"checksum rusttype 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e8b427624232d53e950b2349cfa2a1a16214176f3b412acf89fb8caff7d454c" +"checksum rusttype 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c64ffc93b0cc5a6f5e5e84da2a4082b0271e0a1dd76e821bdac570bda7797e" "checksum sass-rs 0.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "98552ea76b181c4c6d490619e273649432dff0333b8278c53529a86bb99e1a6e" "checksum sass-sys 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "87571886fa04f9a959602861b5b45e54dfbf0b9a85e741a0f8bc700e90914866" "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" -"checksum semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2d5b7638a1f03815d94e88cb3b3c08e87f0db4d683ef499d1836aaf70a45623f" +"checksum semver 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ca1c06afc03e8a202bc5c1db01524cceb7e1b1ca062d959d83a61b20d76e394e" +"checksum semver-parser 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e88e43a5a74dd2a11707f9c21dfd4a423c66bd871df813227bb0a3e78f3a1ae9" "checksum sequence_trie 0.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "d5b4eb0f7d1ff9b9666d8b8ff543f3705dd464025269a5b0e1988ffa60ca1be8" "checksum serde 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "781eed7bf0a59a4b489d761c4eaf9a364cdb036c0656a68cc9c0a761478a537e" "checksum serde_json 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c88a751caa8f0000058fb971cd443ed2e6b653f33f5a47f29892a8bd44ca4c1" -"checksum slug 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39af1ce888a1253c8b9fcfa36626557650fb487c013620a743262d2769a3e9f3" +"checksum slug 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f5ff4b43cb07b86c5f9236c92714a22cdf9e5a27a7d85e398e2c9403328cb8" "checksum solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "172382bac9424588d7840732b250faeeef88942e37b6e35317dce98cafdd75b2" "checksum staticfile 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c684ac0e2be10aa128647caaf539157c3bebc7a8a9693f0d97a42596d9753286" "checksum stb_truetype 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0955c15cfb412f0c4fdfb3d07d2b1915869e472b35646cc3a3a104a8f79517b" "checksum strsim 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4d73a2c36a4d095ed1a6df5cbeac159863173447f7a82b3f4757426844ab825" -"checksum strsim 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d5f575d5ced6634a5c4cb842163dab907dc7e9148b28dc482d81b8855cbe985" +"checksum strsim 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "50c069df92e4b01425a8bf3576d5d417943a6a7272fbabaf5bd80b1aaa76442e" "checksum tar 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "59a5014d9493d6c2799dff5da5d780c2f159bf368c54f115dbc421d02f1d5496" "checksum tempdir 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0b62933a3f96cd559700662c34f8bab881d9e3540289fb4f368419c7f13a5aa9" "checksum term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3deff8a2b3b6607d6d7cc32ac25c0b33709453ca9cceac006caac51e963cf94a" +"checksum term_size 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d470ef1b870a5c71e691676ff34397b175820fd35e30550e5244f35079be02bf" "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" "checksum thread_local 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "55dd963dbaeadc08aa7266bf7f91c3154a7805e32bb94b820b769d2ef3b4744d" "checksum time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "3c7ec6d62a20df54e07ab3b78b9a3932972f4b7981de295563686849eb3989af" @@ -1483,6 +1505,7 @@ dependencies = [ "checksum unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "13a5906ca2b98c799f4b1ab4557b76367ebd6ae5ef14930ec841c74aed5f3764" "checksum unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c1f7ceb96afdfeedee42bade65a0d585a6a0106f681b6749c8ff4daa8df30b3f" "checksum unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "26643a2f83bac55f1976fb716c10234485f9202dcd65cfbdf9da49867b271172" +"checksum unicode-segmentation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b905d0fc2a1f0befd86b0e72e31d1787944efef9d38b9358a9e92a69757f7e3b" "checksum unicode-width 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2d6722facc10989f63ee0e20a83cd4e1714a9ae11529403ac7e0afd069abc39e" "checksum unidecode 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2adb95ee07cd579ed18131f2d9e7a17c25a4b76022935c7f2460d2bfae89fd2" "checksum unsafe-any 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b351086021ebc264aea3ab4f94d61d889d98e5e9ec2d985d993f50133537fd3a" diff --git a/Cargo.toml b/Cargo.toml index 68b1205e8..47f60ee13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cratesfyi" -version = "0.2.0" +version = "0.2.1" authors = ["Onur Aslan "] readme = "README.md" license = "MIT" @@ -15,7 +15,7 @@ postgres = { version = "^0.11", features = [ "time", "rustc-serialize" ] } clap = "2.5.2" time = "0.1" hyper = "0.9.7" -semver = "0.2.2" +semver = "0.4" slug = "^0.1.1" env_logger = "0.3" git2 = "0.4" @@ -23,7 +23,7 @@ magic = "^0.10.0" iron = "0.3.0" router = "0.1.1" staticfile = { version = "0.2.0", features = [ "cache" ] } -handlebars-iron = "0.15.2" +handlebars-iron = "=0.15.2" r2d2 = "0.7.0" r2d2_postgres = "0.10.1" url = "1.1.1" @@ -35,7 +35,7 @@ error-chain = "0.5" [dependencies.cargo] git = "https://github.com/rust-lang/cargo.git" -rev = "ffa147d393037fd5632cd8c9d048b5521d70ab4c" +rev = "c917e94b419ce62760c0a6fdcf90ff0d7d1d5cdb" [dev-dependencies] tempdir = "0.3" diff --git a/src/docbuilder/chroot_builder.rs b/src/docbuilder/chroot_builder.rs index 551eaf6e4..500f476f7 100644 --- a/src/docbuilder/chroot_builder.rs +++ b/src/docbuilder/chroot_builder.rs @@ -379,8 +379,7 @@ impl DocBuilder { ["rustdoc.css", "main.css", "main.js", - "jquery.js", - "playpen.js"], + "jquery.js"], // files doesn't require rustc version subfix ["normalize.css", "FiraSans-Medium.woff", diff --git a/src/utils/build_doc.rs b/src/utils/build_doc.rs index 1eb6dd4ba..e693de914 100644 --- a/src/utils/build_doc.rs +++ b/src/utils/build_doc.rs @@ -6,10 +6,10 @@ use std::path::{Path, PathBuf}; use std::env; -use cargo::core::{SourceId, Dependency, Registry, Source, Package}; +use cargo::core::{SourceId, Dependency, Registry, Source, Package, Workspace}; use cargo::util::{CargoResult, Config, human, Filesystem}; -use cargo::sources::RegistrySource; -use cargo::{ops, ChainError}; +use cargo::sources::SourceConfigMap; +use cargo::ops; /// Builds documentation of a crate and version. @@ -22,9 +22,10 @@ use cargo::{ops, ChainError}; // instead of doing it manually like in the previous version of cratesfyi pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> CargoResult { let config = try!(Config::default()); - let source_id = try!(SourceId::for_central(&config)); + let source_id = try!(SourceId::crates_io(&config)); - let mut source = RegistrySource::new(&source_id, &config); + let source_map = try!(SourceConfigMap::new(&config)); + let mut source = try!(source_map.load(&source_id)); // update crates.io-index registry try!(source.update()); @@ -38,10 +39,8 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> CargoR .unwrap_or(Err(human("PKG download error")))); let current_dir = try!(env::current_dir()); - let target_dir = PathBuf::from(current_dir).join( - format!("{}-{}", pkg.manifest().name(), pkg.manifest().version())); - - config.set_target_dir(Filesystem::new(target_dir.clone())); + let target_dir = PathBuf::from(current_dir) + .join(format!("{}-{}", pkg.manifest().name(), pkg.manifest().version())); let opts = ops::CompileOptions { config: &config, @@ -58,12 +57,11 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> CargoR target_rustdoc_args: None, }; - try!(ops::compile_pkg(&pkg, Some(Box::new(source)), &opts).chain_error(|| { - human(format!("failed to compile `{}`, intermediate artifacts can be \ - found at `{}`", pkg, target_dir.display())) - })); + let ws = try!(Workspace::one(pkg, &config, Some(Filesystem::new(target_dir)))); - Ok(pkg) + try!(ops::compile_ws(&ws, Some(source), &opts)); + + Ok(try!(ws.current()).clone()) } @@ -72,9 +70,10 @@ pub fn build_doc(name: &str, vers: Option<&str>, target: Option<&str>) -> CargoR pub fn get_package(name: &str, vers: Option<&str>) -> CargoResult { debug!("Getting package with cargo"); let config = try!(Config::default()); - let source_id = try!(SourceId::for_central(&config)); + let source_id = try!(SourceId::crates_io(&config)); - let mut source = RegistrySource::new(&source_id, &config); + let source_map = try!(SourceConfigMap::new(&config)); + let mut source = try!(source_map.load(&source_id)); let dep = try!(Dependency::parse(name, vers, &source_id)); let deps = try!(source.query(&dep)); @@ -91,9 +90,10 @@ pub fn get_package(name: &str, vers: Option<&str>) -> CargoResult { /// Updates central crates-io.index repository pub fn update_sources() -> CargoResult<()> { let config = try!(Config::default()); - let source_id = try!(SourceId::for_central(&config)); + let source_id = try!(SourceId::crates_io(&config)); - let mut source = RegistrySource::new(&source_id, &config); + let source_map = try!(SourceConfigMap::new(&config)); + let mut source = try!(source_map.load(&source_id)); source.update() } @@ -111,21 +111,22 @@ pub fn source_path(pkg: &Package) -> Option<&Path> { #[cfg(test)] mod test { use std::path::Path; + use std::fs::remove_dir_all; use super::*; #[test] - #[ignore] fn test_build_doc() { - // FIXME: Need to remove directory after we are finished let doc = build_doc("rand", None, None); assert!(doc.is_ok()); + let doc = doc.unwrap(); + remove_dir_all(format!("{}-{}", doc.manifest().name(), doc.manifest().version())).unwrap(); + let doc = build_doc("SOMECRATEWICHWILLBENVEREXISTS", None, None); assert!(doc.is_err()); } #[test] - #[ignore] fn test_get_package() { let pkg = get_package("rand", None); assert!(pkg.is_ok()); @@ -138,7 +139,6 @@ mod test { #[test] - #[ignore] fn test_source_path() { let pkg = get_package("rand", None).unwrap(); let source_path = source_path(&pkg).unwrap(); diff --git a/src/web/badge/Cargo.toml b/src/web/badge/Cargo.toml index 11bf63ed7..df6b4e758 100644 --- a/src/web/badge/Cargo.toml +++ b/src/web/badge/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "badge" -version = "0.1.0" +version = "0.1.1" description = "Simple badge generator" authors = ["Onur Aslan "] license-file = "LICENSE" @@ -11,4 +11,4 @@ documentation = "https://docs.rs/badge" path = "badge.rs" [dependencies] -rusttype = "0.2.0" +rusttype = "0.2.1"