diff options
| -rw-r--r-- | Cargo.lock | 33 | ||||
| -rw-r--r-- | Cargo.nix | 120 | ||||
| -rw-r--r-- | Cargo.toml | 27 |
3 files changed, 92 insertions, 88 deletions
diff --git a/Cargo.lock b/Cargo.lock index f03b571a7940..0fede8622106 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -53,7 +53,7 @@ dependencies = [ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -233,8 +233,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -255,7 +255,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num-integer 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -304,13 +304,14 @@ dependencies = [ "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "md5 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "mime_guess 2.0.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", "pq-sys 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "r2d2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "tera 0.11.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1331,7 +1332,7 @@ dependencies = [ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1433,7 +1434,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1443,12 +1444,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.55" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_derive" -version = "1.0.55" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1463,7 +1464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1473,7 +1474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1629,7 +1630,7 @@ dependencies = [ "pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "slug 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1993,7 +1994,7 @@ name = "url_serde" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2286,8 +2287,8 @@ dependencies = [ "checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)" = "97f6a6c3caba0cf8f883b53331791036404ce3c1bd895961cf8bb2f8cecfd84b" -"checksum serde_derive 1.0.55 (registry+https://github.com/rust-lang/crates.io-index)" = "f51b0ef935cf8a41a77bce553da1f8751a739b7ad82dd73669475a22e6ecedb0" +"checksum serde 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)" = "490a3394c94953e6f2613b5c7bd58a4dc02e914b313a750311dcd3a230cd50e9" +"checksum serde_derive 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)" = "20ea26d857f7763659029de788973b82431ec660b62e4ad9f7bf471701048663" "checksum serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f3ad6d546e765177cf3dded3c2e424a8040f870083a0e64064746b958ece9cb1" "checksum serde_urlencoded 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e703cef904312097cfceab9ce131ff6bbe09e8c964a0703345a5f49238757bc1" "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" diff --git a/Cargo.nix b/Cargo.nix index f834daf8a5d5..4de17736a928 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -1203,18 +1203,19 @@ rec { sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; inherit dependencies buildDependencies features; }; - serde_1_0_55_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + serde_1_0_56_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "serde"; - version = "1.0.55"; + version = "1.0.56"; authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1vpslfs3j8xbl3srmzppa34h0908q0sj4hyrmlrpklhldii5vbqh"; + sha256 = "1w0yl4bk9lbah6z79gpxd7yr2a6pdw26vv9n0373ybdak4i82vyp"; + build = "build.rs"; inherit dependencies buildDependencies features; }; - serde_derive_1_0_55_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + serde_derive_1_0_56_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "serde_derive"; - version = "1.0.55"; + version = "1.0.56"; authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1ggcidzgi51l3lsdf8gg46ivn61py8rnrf6garpcxwmdbfcc8lgk"; + sha256 = "0j945f9m2dbkc4b41ibhazpyalz98qm3bw2zja356f88z7riaxxc"; procMacro = true; inherit dependencies buildDependencies features; }; @@ -1813,7 +1814,7 @@ rec { uuid_0_6_3.default = true; }) [ actix_derive_0_2_0_features bitflags_1_0_3_features bytes_0_4_7_features crossbeam_channel_0_1_2_features failure_0_1_1_features futures_0_1_21_features libc_0_2_40_features log_0_4_1_features smallvec_0_6_1_features tokio_core_0_1_17_features tokio_io_0_1_6_features tokio_signal_0_1_5_features trust_dns_resolver_0_8_2_features uuid_0_6_3_features skeptic_0_13_3_features ]; actix_web_0_6_7 = { features?(actix_web_0_6_7_features {}) }: actix_web_0_6_7_ { - dependencies = mapFeatures features ([ actix_0_5_7 base64_0_9_1 bitflags_1_0_3 byteorder_1_2_3 bytes_0_4_7 cookie_0_10_1 encoding_0_2_33 failure_0_1_1 futures_0_1_21 futures_cpupool_0_1_8 h2_0_1_7 http_0_1_5 http_range_0_1_1 httparse_1_2_4 language_tags_0_2_2 lazy_static_1_0_0 libc_0_2_40 log_0_4_1 mime_0_3_7 mime_guess_2_0_0_alpha_4 mio_0_6_14 net2_0_2_32 num_cpus_1_8_0 percent_encoding_1_0_1 rand_0_4_2 regex_1_0_0 serde_1_0_55 serde_json_1_0_17 serde_urlencoded_0_5_2 sha1_0_6_0 slab_0_4_0 smallvec_0_6_1 time_0_1_40 tokio_core_0_1_17 tokio_io_0_1_6 url_1_7_0 ] + dependencies = mapFeatures features ([ actix_0_5_7 base64_0_9_1 bitflags_1_0_3 byteorder_1_2_3 bytes_0_4_7 cookie_0_10_1 encoding_0_2_33 failure_0_1_1 futures_0_1_21 futures_cpupool_0_1_8 h2_0_1_7 http_0_1_5 http_range_0_1_1 httparse_1_2_4 language_tags_0_2_2 lazy_static_1_0_0 libc_0_2_40 log_0_4_1 mime_0_3_7 mime_guess_2_0_0_alpha_4 mio_0_6_14 net2_0_2_32 num_cpus_1_8_0 percent_encoding_1_0_1 rand_0_4_2 regex_1_0_0 serde_1_0_56 serde_json_1_0_17 serde_urlencoded_0_5_2 sha1_0_6_0 slab_0_4_0 smallvec_0_6_1 time_0_1_40 tokio_core_0_1_17 tokio_io_0_1_6 url_1_7_0 ] ++ (if features.actix_web_0_6_7."brotli2" or false then [ brotli2_0_3_2 ] else []) ++ (if features.actix_web_0_6_7."flate2" or false then [ flate2_1_0_1 ] else [])); buildDependencies = mapFeatures features ([ version_check_0_1_3 ]); @@ -1894,7 +1895,7 @@ rec { percent_encoding_1_0_1.default = true; rand_0_4_2.default = true; regex_1_0_0.default = true; - serde_1_0_55.default = true; + serde_1_0_56.default = true; serde_json_1_0_17.default = true; serde_urlencoded_0_5_2.default = true; sha1_0_6_0.default = true; @@ -1906,7 +1907,7 @@ rec { url_1_7_0.default = true; url_1_7_0.query_encoding = true; version_check_0_1_3.default = true; - }) [ actix_0_5_7_features base64_0_9_1_features bitflags_1_0_3_features brotli2_0_3_2_features byteorder_1_2_3_features bytes_0_4_7_features cookie_0_10_1_features encoding_0_2_33_features failure_0_1_1_features flate2_1_0_1_features futures_0_1_21_features futures_cpupool_0_1_8_features h2_0_1_7_features http_0_1_5_features http_range_0_1_1_features httparse_1_2_4_features language_tags_0_2_2_features lazy_static_1_0_0_features libc_0_2_40_features log_0_4_1_features mime_0_3_7_features mime_guess_2_0_0_alpha_4_features mio_0_6_14_features net2_0_2_32_features num_cpus_1_8_0_features percent_encoding_1_0_1_features rand_0_4_2_features regex_1_0_0_features serde_1_0_55_features serde_json_1_0_17_features serde_urlencoded_0_5_2_features sha1_0_6_0_features slab_0_4_0_features smallvec_0_6_1_features time_0_1_40_features tokio_core_0_1_17_features tokio_io_0_1_6_features url_1_7_0_features version_check_0_1_3_features ]; + }) [ actix_0_5_7_features base64_0_9_1_features bitflags_1_0_3_features brotli2_0_3_2_features byteorder_1_2_3_features bytes_0_4_7_features cookie_0_10_1_features encoding_0_2_33_features failure_0_1_1_features flate2_1_0_1_features futures_0_1_21_features futures_cpupool_0_1_8_features h2_0_1_7_features http_0_1_5_features http_range_0_1_1_features httparse_1_2_4_features language_tags_0_2_2_features lazy_static_1_0_0_features libc_0_2_40_features log_0_4_1_features mime_0_3_7_features mime_guess_2_0_0_alpha_4_features mio_0_6_14_features net2_0_2_32_features num_cpus_1_8_0_features percent_encoding_1_0_1_features rand_0_4_2_features regex_1_0_0_features serde_1_0_56_features serde_json_1_0_17_features serde_urlencoded_0_5_2_features sha1_0_6_0_features slab_0_4_0_features smallvec_0_6_1_features time_0_1_40_features tokio_core_0_1_17_features tokio_io_0_1_6_features url_1_7_0_features version_check_0_1_3_features ]; actix_derive_0_2_0 = { features?(actix_derive_0_2_0_features {}) }: actix_derive_0_2_0_ { dependencies = mapFeatures features ([ quote_0_3_15 rand_0_3_22 syn_0_11_11 ]); buildDependencies = mapFeatures features ([ version_check_0_1_3 ]); @@ -2223,17 +2224,17 @@ rec { iovec_0_1_2.default = true; }) [ byteorder_1_2_3_features iovec_0_1_2_features ]; cargo_metadata_0_5_4 = { features?(cargo_metadata_0_5_4_features {}) }: cargo_metadata_0_5_4_ { - dependencies = mapFeatures features ([ error_chain_0_11_0 semver_0_9_0 serde_1_0_55 serde_derive_1_0_55 serde_json_1_0_17 ]); + dependencies = mapFeatures features ([ error_chain_0_11_0 semver_0_9_0 serde_1_0_56 serde_derive_1_0_56 serde_json_1_0_17 ]); }; cargo_metadata_0_5_4_features = f: updateFeatures f (rec { cargo_metadata_0_5_4.default = (f.cargo_metadata_0_5_4.default or true); error_chain_0_11_0.default = true; semver_0_9_0.default = true; semver_0_9_0.serde = true; - serde_1_0_55.default = true; - serde_derive_1_0_55.default = true; + serde_1_0_56.default = true; + serde_derive_1_0_56.default = true; serde_json_1_0_17.default = true; - }) [ error_chain_0_11_0_features semver_0_9_0_features serde_1_0_55_features serde_derive_1_0_55_features serde_json_1_0_17_features ]; + }) [ error_chain_0_11_0_features semver_0_9_0_features serde_1_0_56_features serde_derive_1_0_56_features serde_json_1_0_17_features ]; cc_1_0_15 = { features?(cc_1_0_15_features {}) }: cc_1_0_15_ { dependencies = mapFeatures features ([]); features = mkFeatures (features.cc_1_0_15 or {}); @@ -2251,7 +2252,7 @@ rec { }) []; chrono_0_4_2 = { features?(chrono_0_4_2_features {}) }: chrono_0_4_2_ { dependencies = mapFeatures features ([ num_integer_0_1_38 num_traits_0_2_4 ] - ++ (if features.chrono_0_4_2.serde or false then [ serde_1_0_55 ] else []) + ++ (if features.chrono_0_4_2.serde or false then [ serde_1_0_56 ] else []) ++ (if features.chrono_0_4_2.time or false then [ time_0_1_40 ] else [])); features = mkFeatures (features.chrono_0_4_2 or {}); }; @@ -2267,9 +2268,9 @@ rec { (chrono_0_4_2.clock or false); num_integer_0_1_38.default = (f.num_integer_0_1_38.default or false); num_traits_0_2_4.default = (f.num_traits_0_2_4.default or false); - serde_1_0_55.default = true; + serde_1_0_56.default = true; time_0_1_40.default = true; - }) [ num_integer_0_1_38_features num_traits_0_2_4_features serde_1_0_55_features time_0_1_40_features ]; + }) [ num_integer_0_1_38_features num_traits_0_2_4_features serde_1_0_56_features time_0_1_40_features ]; clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ { dependencies = mapFeatures features ([ bitflags_1_0_3 textwrap_0_9_0 unicode_width_0_1_4 ] ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_10 ] else []) @@ -2355,7 +2356,7 @@ rec { unicode_categories_0_1_1.default = true; }) [ clap_2_31_2_features entities_1_0_1_features lazy_static_1_0_0_features pest_1_0_6_features pest_derive_1_0_7_features regex_0_2_11_features twoway_0_1_8_features typed_arena_1_3_0_features unicode_categories_0_1_1_features ]; converse_0_1_0 = { features?(converse_0_1_0_features {}) }: converse_0_1_0_ { - dependencies = mapFeatures features ([ actix_0_5_7 actix_web_0_6_7 chrono_0_4_2 comrak_0_2_12 diesel_1_2_2 env_logger_0_5_10 failure_0_1_1 futures_0_1_21 hyper_0_11_27 log_0_4_1 md5_0_3_7 pq_sys_0_4_4 r2d2_0_8_2 rand_0_4_2 reqwest_0_8_5 serde_1_0_55 serde_derive_1_0_55 serde_json_1_0_17 tera_0_11_7 tokio_0_1_6 tokio_timer_0_2_3 url_1_7_0 url_serde_0_2_0 ]); + dependencies = mapFeatures features ([ actix_0_5_7 actix_web_0_6_7 chrono_0_4_2 comrak_0_2_12 diesel_1_2_2 env_logger_0_5_10 failure_0_1_1 futures_0_1_21 hyper_0_11_27 log_0_4_1 md5_0_3_7 mime_guess_2_0_0_alpha_4 pq_sys_0_4_4 r2d2_0_8_2 rand_0_4_2 reqwest_0_8_5 serde_1_0_56 serde_derive_1_0_56 serde_json_1_0_17 tera_0_11_7 tokio_0_1_6 tokio_timer_0_2_3 url_1_7_0 url_serde_0_2_0 ]); buildDependencies = mapFeatures features ([ pulldown_cmark_0_1_2 ]); }; converse_0_1_0_features = f: updateFeatures f (rec { @@ -2375,20 +2376,21 @@ rec { hyper_0_11_27.default = true; log_0_4_1.default = true; md5_0_3_7.default = true; + mime_guess_2_0_0_alpha_4.default = true; pq_sys_0_4_4.default = true; pulldown_cmark_0_1_2.default = true; r2d2_0_8_2.default = true; rand_0_4_2.default = true; reqwest_0_8_5.default = true; - serde_1_0_55.default = true; - serde_derive_1_0_55.default = true; + serde_1_0_56.default = true; + serde_derive_1_0_56.default = true; serde_json_1_0_17.default = true; tera_0_11_7.default = true; tokio_0_1_6.default = true; tokio_timer_0_2_3.default = true; url_1_7_0.default = true; url_serde_0_2_0.default = true; - }) [ actix_0_5_7_features actix_web_0_6_7_features chrono_0_4_2_features comrak_0_2_12_features diesel_1_2_2_features env_logger_0_5_10_features failure_0_1_1_features futures_0_1_21_features hyper_0_11_27_features log_0_4_1_features md5_0_3_7_features pq_sys_0_4_4_features r2d2_0_8_2_features rand_0_4_2_features reqwest_0_8_5_features serde_1_0_55_features serde_derive_1_0_55_features serde_json_1_0_17_features tera_0_11_7_features tokio_0_1_6_features tokio_timer_0_2_3_features url_1_7_0_features url_serde_0_2_0_features pulldown_cmark_0_1_2_features ]; + }) [ actix_0_5_7_features actix_web_0_6_7_features chrono_0_4_2_features comrak_0_2_12_features diesel_1_2_2_features env_logger_0_5_10_features failure_0_1_1_features futures_0_1_21_features hyper_0_11_27_features log_0_4_1_features md5_0_3_7_features mime_guess_2_0_0_alpha_4_features pq_sys_0_4_4_features r2d2_0_8_2_features rand_0_4_2_features reqwest_0_8_5_features serde_1_0_56_features serde_derive_1_0_56_features serde_json_1_0_17_features tera_0_11_7_features tokio_0_1_6_features tokio_timer_0_2_3_features url_1_7_0_features url_serde_0_2_0_features pulldown_cmark_0_1_2_features ]; cookie_0_10_1 = { features?(cookie_0_10_1_features {}) }: cookie_0_10_1_ { dependencies = mapFeatures features ([ time_0_1_40 ] ++ (if features.cookie_0_10_1."base64" or false then [ base64_0_6_0 ] else []) @@ -3985,7 +3987,7 @@ rec { winapi_0_3_4.winerror = true; }) [ winapi_0_3_4_features ]; reqwest_0_8_5 = { features?(reqwest_0_8_5_features {}) }: reqwest_0_8_5_ { - dependencies = mapFeatures features ([ bytes_0_4_7 encoding_rs_0_7_2 futures_0_1_21 hyper_0_11_27 hyper_tls_0_1_3 libflate_0_1_14 log_0_4_1 mime_guess_2_0_0_alpha_4 native_tls_0_1_5 serde_1_0_55 serde_json_1_0_17 serde_urlencoded_0_5_2 tokio_core_0_1_17 tokio_io_0_1_6 tokio_tls_0_1_4 url_1_7_0 uuid_0_5_1 ]); + dependencies = mapFeatures features ([ bytes_0_4_7 encoding_rs_0_7_2 futures_0_1_21 hyper_0_11_27 hyper_tls_0_1_3 libflate_0_1_14 log_0_4_1 mime_guess_2_0_0_alpha_4 native_tls_0_1_5 serde_1_0_56 serde_json_1_0_17 serde_urlencoded_0_5_2 tokio_core_0_1_17 tokio_io_0_1_6 tokio_tls_0_1_4 url_1_7_0 uuid_0_5_1 ]); features = mkFeatures (features.reqwest_0_8_5 or {}); }; reqwest_0_8_5_features = f: updateFeatures f (rec { @@ -3999,7 +4001,7 @@ rec { mime_guess_2_0_0_alpha_4.default = true; native_tls_0_1_5.default = true; reqwest_0_8_5.default = (f.reqwest_0_8_5.default or true); - serde_1_0_55.default = true; + serde_1_0_56.default = true; serde_json_1_0_17.default = true; serde_urlencoded_0_5_2.default = true; tokio_core_0_1_17.default = true; @@ -4008,7 +4010,7 @@ rec { url_1_7_0.default = true; uuid_0_5_1."v4" = true; uuid_0_5_1.default = true; - }) [ bytes_0_4_7_features encoding_rs_0_7_2_features futures_0_1_21_features hyper_0_11_27_features hyper_tls_0_1_3_features libflate_0_1_14_features log_0_4_1_features mime_guess_2_0_0_alpha_4_features native_tls_0_1_5_features serde_1_0_55_features serde_json_1_0_17_features serde_urlencoded_0_5_2_features tokio_core_0_1_17_features tokio_io_0_1_6_features tokio_tls_0_1_4_features url_1_7_0_features uuid_0_5_1_features ]; + }) [ bytes_0_4_7_features encoding_rs_0_7_2_features futures_0_1_21_features hyper_0_11_27_features hyper_tls_0_1_3_features libflate_0_1_14_features log_0_4_1_features mime_guess_2_0_0_alpha_4_features native_tls_0_1_5_features serde_1_0_56_features serde_json_1_0_17_features serde_urlencoded_0_5_2_features tokio_core_0_1_17_features tokio_io_0_1_6_features tokio_tls_0_1_4_features url_1_7_0_features uuid_0_5_1_features ]; resolv_conf_0_6_0 = { features?(resolv_conf_0_6_0_features {}) }: resolv_conf_0_6_0_ { dependencies = mapFeatures features ([ quick_error_1_2_1 ] ++ (if features.resolv_conf_0_6_0.hostname or false then [ hostname_0_1_4 ] else [])); @@ -4179,7 +4181,7 @@ rec { }) [ core_foundation_sys_0_2_3_features libc_0_2_40_features ]; semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ { dependencies = mapFeatures features ([ semver_parser_0_7_0 ] - ++ (if features.semver_0_9_0.serde or false then [ serde_1_0_55 ] else [])); + ++ (if features.semver_0_9_0.serde or false then [ serde_1_0_56 ] else [])); features = mkFeatures (features.semver_0_9_0 or {}); }; semver_0_9_0_features = f: updateFeatures f (rec { @@ -4189,66 +4191,66 @@ rec { (f.semver_0_9_0.ci or false) || (semver_0_9_0.ci or false); semver_parser_0_7_0.default = true; - serde_1_0_55.default = true; - }) [ semver_parser_0_7_0_features serde_1_0_55_features ]; + serde_1_0_56.default = true; + }) [ semver_parser_0_7_0_features serde_1_0_56_features ]; semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {}; semver_parser_0_7_0_features = f: updateFeatures f (rec { semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true); }) []; - serde_1_0_55 = { features?(serde_1_0_55_features {}) }: serde_1_0_55_ { + serde_1_0_56 = { features?(serde_1_0_56_features {}) }: serde_1_0_56_ { dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_55 or {}); - }; - serde_1_0_55_features = f: updateFeatures f (rec { - serde_1_0_55.default = (f.serde_1_0_55.default or true); - serde_1_0_55.serde_derive = - (f.serde_1_0_55.serde_derive or false) || - (f.serde_1_0_55.derive or false) || - (serde_1_0_55.derive or false); - serde_1_0_55.std = - (f.serde_1_0_55.std or false) || - (f.serde_1_0_55.default or false) || - (serde_1_0_55.default or false); - serde_1_0_55.unstable = - (f.serde_1_0_55.unstable or false) || - (f.serde_1_0_55.alloc or false) || - (serde_1_0_55.alloc or false); + features = mkFeatures (features.serde_1_0_56 or {}); + }; + serde_1_0_56_features = f: updateFeatures f (rec { + serde_1_0_56.default = (f.serde_1_0_56.default or true); + serde_1_0_56.serde_derive = + (f.serde_1_0_56.serde_derive or false) || + (f.serde_1_0_56.derive or false) || + (serde_1_0_56.derive or false); + serde_1_0_56.std = + (f.serde_1_0_56.std or false) || + (f.serde_1_0_56.default or false) || + (serde_1_0_56.default or false); + serde_1_0_56.unstable = + (f.serde_1_0_56.unstable or false) || + (f.serde_1_0_56.alloc or false) || + (serde_1_0_56.alloc or false); }) []; - serde_derive_1_0_55 = { features?(serde_derive_1_0_55_features {}) }: serde_derive_1_0_55_ { + serde_derive_1_0_56 = { features?(serde_derive_1_0_56_features {}) }: serde_derive_1_0_56_ { dependencies = mapFeatures features ([ proc_macro2_0_3_8 quote_0_5_2 syn_0_13_10 ]); - features = mkFeatures (features.serde_derive_1_0_55 or {}); + features = mkFeatures (features.serde_derive_1_0_56 or {}); }; - serde_derive_1_0_55_features = f: updateFeatures f (rec { + serde_derive_1_0_56_features = f: updateFeatures f (rec { proc_macro2_0_3_8.default = true; quote_0_5_2.default = true; - serde_derive_1_0_55.default = (f.serde_derive_1_0_55.default or true); + serde_derive_1_0_56.default = (f.serde_derive_1_0_56.default or true); syn_0_13_10.default = true; syn_0_13_10.visit = true; }) [ proc_macro2_0_3_8_features quote_0_5_2_features syn_0_13_10_features ]; serde_json_1_0_17 = { features?(serde_json_1_0_17_features {}) }: serde_json_1_0_17_ { - dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 serde_1_0_55 ]); + dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 serde_1_0_56 ]); features = mkFeatures (features.serde_json_1_0_17 or {}); }; serde_json_1_0_17_features = f: updateFeatures f (rec { dtoa_0_4_2.default = true; itoa_0_4_1.default = true; - serde_1_0_55.default = true; + serde_1_0_56.default = true; serde_json_1_0_17."linked-hash-map" = (f.serde_json_1_0_17."linked-hash-map" or false) || (f.serde_json_1_0_17.preserve_order or false) || (serde_json_1_0_17.preserve_order or false); serde_json_1_0_17.default = (f.serde_json_1_0_17.default or true); - }) [ dtoa_0_4_2_features itoa_0_4_1_features serde_1_0_55_features ]; + }) [ dtoa_0_4_2_features itoa_0_4_1_features serde_1_0_56_features ]; serde_urlencoded_0_5_2 = { features?(serde_urlencoded_0_5_2_features {}) }: serde_urlencoded_0_5_2_ { - dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 serde_1_0_55 url_1_7_0 ]); + dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 serde_1_0_56 url_1_7_0 ]); }; serde_urlencoded_0_5_2_features = f: updateFeatures f (rec { dtoa_0_4_2.default = true; itoa_0_4_1.default = true; - serde_1_0_55.default = true; + serde_1_0_56.default = true; serde_urlencoded_0_5_2.default = (f.serde_urlencoded_0_5_2.default or true); url_1_7_0.default = true; - }) [ dtoa_0_4_2_features itoa_0_4_1_features serde_1_0_55_features url_1_7_0_features ]; + }) [ dtoa_0_4_2_features itoa_0_4_1_features serde_1_0_56_features url_1_7_0_features ]; sha1_0_6_0 = { features?(sha1_0_6_0_features {}) }: sha1_0_6_0_ { dependencies = mapFeatures features ([]); features = mkFeatures (features.sha1_0_6_0 or {}); @@ -4477,7 +4479,7 @@ rec { tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); }) [ rand_0_4_2_features remove_dir_all_0_5_1_features ]; tera_0_11_7 = { features?(tera_0_11_7_features {}) }: tera_0_11_7_ { - dependencies = mapFeatures features ([ chrono_0_4_2 error_chain_0_11_0 glob_0_2_11 humansize_1_1_0 lazy_static_1_0_0 pest_1_0_6 pest_derive_1_0_7 regex_0_2_11 serde_1_0_55 serde_json_1_0_17 slug_0_1_3 url_1_7_0 ]); + dependencies = mapFeatures features ([ chrono_0_4_2 error_chain_0_11_0 glob_0_2_11 humansize_1_1_0 lazy_static_1_0_0 pest_1_0_6 pest_derive_1_0_7 regex_0_2_11 serde_1_0_56 serde_json_1_0_17 slug_0_1_3 url_1_7_0 ]); }; tera_0_11_7_features = f: updateFeatures f (rec { chrono_0_4_2.default = true; @@ -4488,12 +4490,12 @@ rec { pest_1_0_6.default = true; pest_derive_1_0_7.default = true; regex_0_2_11.default = true; - serde_1_0_55.default = true; + serde_1_0_56.default = true; serde_json_1_0_17.default = true; slug_0_1_3.default = true; tera_0_11_7.default = (f.tera_0_11_7.default or true); url_1_7_0.default = true; - }) [ chrono_0_4_2_features error_chain_0_11_0_features glob_0_2_11_features humansize_1_1_0_features lazy_static_1_0_0_features pest_1_0_6_features pest_derive_1_0_7_features regex_0_2_11_features serde_1_0_55_features serde_json_1_0_17_features slug_0_1_3_features url_1_7_0_features ]; + }) [ chrono_0_4_2_features error_chain_0_11_0_features glob_0_2_11_features humansize_1_1_0_features lazy_static_1_0_0_features pest_1_0_6_features pest_derive_1_0_7_features regex_0_2_11_features serde_1_0_56_features serde_json_1_0_17_features slug_0_1_3_features url_1_7_0_features ]; termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ { dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []); }; @@ -4965,13 +4967,13 @@ rec { (url_1_7_0.heap_size or false); }) [ encoding_0_2_33_features idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_1_features ]; url_serde_0_2_0 = { features?(url_serde_0_2_0_features {}) }: url_serde_0_2_0_ { - dependencies = mapFeatures features ([ serde_1_0_55 url_1_7_0 ]); + dependencies = mapFeatures features ([ serde_1_0_56 url_1_7_0 ]); }; url_serde_0_2_0_features = f: updateFeatures f (rec { - serde_1_0_55.default = true; + serde_1_0_56.default = true; url_1_7_0.default = true; url_serde_0_2_0.default = (f.url_serde_0_2_0.default or true); - }) [ serde_1_0_55_features url_1_7_0_features ]; + }) [ serde_1_0_56_features url_1_7_0_features ]; utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; utf8_ranges_1_0_0_features = f: updateFeatures f (rec { utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); diff --git a/Cargo.toml b/Cargo.toml index cf29e52d36b2..76bf1a06046b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,27 +7,28 @@ license = "AGPL-3.0-or-later" [dependencies] actix = "0.5" actix-web = "0.6" -env_logger = "0.5" -diesel = { version = "1.2", features = ["postgres", "chrono", "r2d2"]} chrono = { version = "0.4", features = ["serde"] } +comrak = "0.2" +diesel = { version = "1.2", features = ["postgres", "chrono", "r2d2"]} +env_logger = "0.5" +failure = "0.1" +futures = "0.1" +hyper = "0.11" log = "0.4" +md5 = "0.3.7" +mime_guess = "2.0.0-alpha" +pq-sys = "=0.4.4" r2d2 = "0.8" -futures = "0.1" -tera = "0.11" +rand = "0.4" +reqwest = "0.8" serde = "1.0" serde_derive = "1.0" -failure = "0.1" -url = "1.7" -url_serde = "0.2" -reqwest = "0.8" serde_json = "1.0" -hyper = "0.11" -rand = "0.4" -comrak = "0.2" -md5 = "0.3.7" +tera = "0.11" tokio = "0.1" tokio-timer = "0.2" -pq-sys = "=0.4.4" +url = "1.7" +url_serde = "0.2" [build-dependencies] pulldown-cmark = "0.1" |