diff --git a/Cargo.lock b/Cargo.lock index 14e59101aac..1d8597da2ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,16 +33,16 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "once_cell", "version_check 0.9.4", ] [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -70,15 +70,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "anyhow" version = "1.0.66" @@ -168,16 +159,16 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" dependencies = [ - "concurrent-queue", + "concurrent-queue 1.2.4", "event-listener", "futures-core", ] [[package]] name = "async-compression" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345fd392ab01f746c717b1357165b76f0b67a60192007b234058c9045fdcf695" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" dependencies = [ "flate2", "futures-core", @@ -188,23 +179,23 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ + "async-lock", "async-task", - "concurrent-queue", + "concurrent-queue 2.0.0", "fastrand", "futures-lite", - "once_cell", "slab", ] [[package]] name = "async-global-executor" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", @@ -217,16 +208,16 @@ dependencies = [ [[package]] name = "async-io" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" +checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" dependencies = [ + "async-lock", "autocfg 1.1.0", - "concurrent-queue", + "concurrent-queue 1.2.4", "futures-lite", "libc", "log 0.4.17", - "once_cell", "parking", "polling", "slab", @@ -237,11 +228,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" +checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" dependencies = [ "event-listener", + "futures-lite", ] [[package]] @@ -254,7 +246,7 @@ dependencies = [ "async-global-executor", "async-io", "async-lock", - "crossbeam-utils 0.8.11", + "crossbeam-utils 0.8.14", "futures-channel", "futures-core", "futures-io", @@ -299,9 +291,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" +checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ "proc-macro2", "quote", @@ -365,9 +357,9 @@ dependencies = [ "bytes 1.1.0", "hex", "http", - "hyper 0.14.20", + "hyper 0.14.23", "ring", - "time 0.3.14", + "time 0.3.17", "tokio", "tower", "tracing", @@ -530,7 +522,7 @@ dependencies = [ "percent-encoding 2.1.0", "regex", "ring", - "time 0.3.14", + "time 0.3.17", "tracing", ] @@ -581,7 +573,7 @@ dependencies = [ "fastrand", "http", "http-body", - "hyper 0.14.20", + "hyper 0.14.23", "hyper-rustls 0.22.1", "lazy_static", "pin-project-lite", @@ -614,7 +606,7 @@ dependencies = [ "futures-core", "http", "http-body", - "hyper 0.14.20", + "hyper 0.14.23", "once_cell", "percent-encoding 2.1.0", "pin-project-lite", @@ -663,10 +655,10 @@ version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e93b0c93a3b963da946a0b8ef3853a7252298eb75cdbfb21dad60f5ed0ded861" dependencies = [ - "itoa 1.0.3", + "itoa 1.0.4", "num-integer", "ryu", - "time 0.3.14", + "time 0.3.17", ] [[package]] @@ -696,9 +688,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.5.16" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e3356844c4d6a6d6467b8da2cffb4a2820be256f50a3a386c9d152bab31043" +checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" dependencies = [ "async-trait", "axum-core", @@ -707,8 +699,8 @@ dependencies = [ "futures-util", "http", "http-body", - "hyper 0.14.20", - "itoa 1.0.3", + "hyper 0.14.23", + "itoa 1.0.4", "matchit", "memchr", "mime 0.3.16", @@ -725,9 +717,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c0a60006f2a293d82d571f635042a72edf927539b7685bd62d361963839b" +checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" dependencies = [ "async-trait", "bytes 1.1.0", @@ -775,9 +767,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bimap" @@ -799,18 +791,19 @@ dependencies = [ [[package]] name = "bincode" -version = "2.0.0-rc.1" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f609ceb2c41b0d0277314a789ef0e7eb14593d5485f7c67320bed3924ebb1b33" +checksum = "7bb50c5a2ef4b9b1e7ae73e3a73b52ea24b20312d629f9c4df28260b7ad2c3c4" dependencies = [ "bincode_derive", + "serde", ] [[package]] name = "bincode_derive" -version = "2.0.0-rc.1" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "913287a8f3e00db4c7ae1b87e9b9b8cebd6b89217eaadfc281fa5c897da35dc3" +checksum = "0a45a23389446d2dd25dc8e73a7a3b3c43522b630cac068927f0649d43d719d2" dependencies = [ "virtue", ] @@ -909,9 +902,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "byte-tools" @@ -921,9 +914,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byte-unit" -version = "4.0.14" +version = "4.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ebf10dda65f19ff0f42ea15572a359ed60d7fc74fdc984d90310937be0014b" +checksum = "581ad4b3d627b0c09a0ccb2912148f839acaca0b93cf54cbe42b6c674e86079c" dependencies = [ "serde", "utf8-width", @@ -937,9 +930,9 @@ checksum = "be0fdd54b507df8f22012890aadd099979befdba27713c767993f8380112ca7c" [[package]] name = "bytemuck" -version = "1.12.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" +checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" [[package]] name = "byteorder" @@ -989,7 +982,7 @@ dependencies = [ "async_once", "cached_proc_macro", "cached_proc_macro_types", - "futures 0.3.24", + "futures 0.3.25", "hashbrown", "instant", "lazy_static", @@ -1024,9 +1017,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cesu8" @@ -1048,9 +1041,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", @@ -1075,27 +1068,27 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.15" +version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a35a599b11c089a7f49105658d089b8f2cf0882993c17daf6de15285c2c35d" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ "atty", "bitflags", "clap_derive", "clap_lex", "indexmap", - "lazy_static", + "once_cell", "strsim", "termcolor", - "terminal_size", - "textwrap 0.15.0", + "terminal_size 0.2.2", + "textwrap 0.16.0", ] [[package]] name = "clap_derive" -version = "3.1.7" +version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ "heck", "proc-macro-error", @@ -1129,6 +1122,16 @@ dependencies = [ "enso-prelude", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "colored" version = "2.0.0" @@ -1172,6 +1175,15 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "concurrent-queue" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +dependencies = [ + "crossbeam-utils 0.8.14", +] + [[package]] name = "config-reader" version = "0.1.0" @@ -1183,14 +1195,14 @@ dependencies = [ [[package]] name = "console" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" +checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" dependencies = [ "encode_unicode", + "lazy_static", "libc", - "once_cell", - "terminal_size", + "terminal_size 0.1.17", "unicode-width", "winapi 0.3.9", ] @@ -1215,8 +1227,8 @@ checksum = "e933c43a5db3779b3600cdab18856af2411ca2237e33ba8ab476d5d5b1a6c1e7" dependencies = [ "console-api", "crossbeam-channel", - "crossbeam-utils 0.8.11", - "futures 0.3.24", + "crossbeam-utils 0.8.14", + "futures 0.3.25", "hdrhistogram", "humantime 2.1.0", "prost-types", @@ -1242,18 +1254,18 @@ dependencies = [ [[package]] name = "const_format" -version = "0.2.26" +version = "0.2.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939dc9e2eb9077e0679d2ce32de1ded8531779360b003b4a972a7a39ec263495" +checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.22" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef196d5d972878a48da7decb7686eded338b4858fbabeed513d63a7c98b2b82d" +checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" dependencies = [ "proc-macro2", "quote", @@ -1378,7 +1390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.11", + "crossbeam-utils 0.8.14", ] [[package]] @@ -1389,20 +1401,19 @@ checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils 0.8.11", + "crossbeam-utils 0.8.14", ] [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg 1.1.0", "cfg-if 1.0.0", - "crossbeam-utils 0.8.11", - "memoffset", - "once_cell", + "crossbeam-utils 0.8.14", + "memoffset 0.7.1", "scopeguard", ] @@ -1419,12 +1430,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if 1.0.0", - "once_cell", ] [[package]] @@ -1470,14 +1480,58 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", "syn", ] +[[package]] +name = "cxx" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "darling" version = "0.13.4" @@ -1655,9 +1709,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -1759,7 +1813,7 @@ dependencies = [ "failure", "flatbuffers", "flatc-rust", - "futures 0.3.24", + "futures 0.3.25", "hex", "json-rpc", "mockall", @@ -1792,13 +1846,13 @@ dependencies = [ "aws-config", "aws-sdk-ecr", "aws-sdk-s3", - "base64 0.13.0", + "base64 0.13.1", "byte-unit", "bytes 1.1.0", "cached", "cfg-if 1.0.0", "chrono", - "clap 3.1.15", + "clap 3.2.23", "console-subscriber", "derivative", "derive_more", @@ -1808,7 +1862,7 @@ dependencies = [ "flate2", "flume", "fs_extra", - "futures 0.3.24", + "futures 0.3.25", "futures-util", "glob", "heck", @@ -1850,7 +1904,7 @@ dependencies = [ "tracing-subscriber", "unicase 2.6.0", "url 2.3.0", - "uuid 1.1.2", + "uuid 1.2.2", "walkdir", "which", "whoami", @@ -1863,7 +1917,7 @@ version = "0.1.0" dependencies = [ "anyhow", "fn-error-context", - "futures 0.3.24", + "futures 0.3.25", "futures-util", "serde", "serde_json", @@ -1878,12 +1932,12 @@ dependencies = [ "anyhow", "byte-unit", "chrono", - "clap 3.1.15", + "clap 3.2.23", "derivative", "enso-build", "enso-build-base", "enso-formatter", - "futures 0.3.24", + "futures 0.3.25", "futures-util", "glob", "humantime 2.1.0", @@ -1961,7 +2015,7 @@ name = "enso-debug-api" version = "0.1.0" dependencies = [ "derivative", - "futures 0.3.24", + "futures 0.3.25", "js-sys", "wasm-bindgen", "web-sys", @@ -2046,7 +2100,7 @@ dependencies = [ "ensogl-text-msdf", "failure", "flo_stream", - "futures 0.3.24", + "futures 0.3.25", "fuzzly", "ide-view", "itertools 0.10.5", @@ -2147,7 +2201,7 @@ dependencies = [ "rand_distr", "serde", "serde_json", - "uuid 1.1.2", + "uuid 1.2.2", ] [[package]] @@ -2210,7 +2264,7 @@ dependencies = [ "enso-shapely", "enso-web", "failure", - "futures 0.3.24", + "futures 0.3.25", "gen-iter", "ifmt", "itertools 0.10.5", @@ -2221,7 +2275,7 @@ dependencies = [ "serde", "serde_json", "shrinkwraprs 0.3.0", - "smallvec 1.9.0", + "smallvec 1.10.0", "tracing", "tracing-subscriber", "tracing-wasm", @@ -2237,7 +2291,7 @@ version = "0.1.0" dependencies = [ "enso-profiler-macros", "enso-web", - "futures 0.3.24", + "futures 0.3.25", "serde", "serde_json", "wasm-bindgen", @@ -2250,7 +2304,7 @@ dependencies = [ "derivative", "enso-prelude", "enso-profiler", - "futures 0.3.24", + "futures 0.3.25", "serde", "serde_json", ] @@ -2260,7 +2314,7 @@ name = "enso-profiler-demo-data" version = "0.1.0" dependencies = [ "enso-profiler", - "futures 0.3.24", + "futures 0.3.25", ] [[package]] @@ -2282,7 +2336,7 @@ version = "0.1.0" dependencies = [ "enso-profiler", "enso-profiler-data", - "futures 0.3.24", + "futures 0.3.25", ] [[package]] @@ -2469,7 +2523,7 @@ dependencies = [ "semver 1.0.14", "serde", "shrinkwraprs 0.3.0", - "smallvec 1.9.0", + "smallvec 1.10.0", "typenum", "wasm-bindgen", "wasm-bindgen-test", @@ -2634,7 +2688,7 @@ dependencies = [ "ensogl-text", "ensogl-text-msdf", "ensogl-tooltip", - "futures 0.3.24", + "futures 0.3.25", "qstring", "serde", "url 2.3.0", @@ -2658,7 +2712,7 @@ dependencies = [ "ensogl-text", "ensogl-text-msdf", "ensogl-tooltip", - "futures 0.3.24", + "futures 0.3.25", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -2889,7 +2943,7 @@ dependencies = [ name = "ensogl-text" version = "0.1.0" dependencies = [ - "bincode 2.0.0-rc.1", + "bincode 2.0.0-rc.2", "const_format", "enso-frp", "enso-prelude", @@ -2941,7 +2995,7 @@ dependencies = [ "ensogl-text-embedded-fonts", "ensogl-text-font-family", "failure", - "futures 0.3.24", + "futures 0.3.25", "ide-ci", "js-sys", "nalgebra", @@ -2995,6 +3049,27 @@ dependencies = [ "termcolor", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -3023,6 +3098,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "fake-simd" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + [[package]] name = "fastrand" version = "1.8.0" @@ -3034,14 +3115,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.2.16", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3078,8 +3159,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b02e0d3667b27514149c1ac9b372d700f3e6df4bbaf6b7c5df12915de2996049" dependencies = [ - "futures 0.3.24", - "smallvec 1.9.0", + "futures 0.3.25", + "smallvec 1.10.0", ] [[package]] @@ -3154,9 +3235,18 @@ dependencies = [ [[package]] name = "fragile" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab" +checksum = "b7464c5c4a3f014d9b2ec4073650e5c06596f385060af740fc45ad5a19f959e8" +dependencies = [ + "fragile 2.0.0", +] + +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "fs_extra" @@ -3194,9 +3284,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", @@ -3209,9 +3299,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", "futures-sink", @@ -3219,15 +3309,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-executor" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", @@ -3236,9 +3326,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-lite" @@ -3257,9 +3347,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", @@ -3268,15 +3358,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-timer" @@ -3286,9 +3376,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-channel", "futures-core", @@ -3356,9 +3446,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3451,9 +3541,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ "bytes 1.1.0", "fnv", @@ -3489,7 +3579,7 @@ version = "7.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "byteorder", "flate2", "nom", @@ -3502,7 +3592,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bitflags", "bytes 1.1.0", "headers-core", @@ -3550,7 +3640,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes 1.1.0", "fnv", - "itoa 1.0.3", + "itoa 1.0.4", ] [[package]] @@ -3588,7 +3678,7 @@ checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" dependencies = [ "anyhow", "async-channel", - "base64 0.13.0", + "base64 0.13.1", "futures-lite", "http", "infer", @@ -3649,9 +3739,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ "bytes 1.1.0", "futures-channel", @@ -3662,7 +3752,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.3", + "itoa 1.0.4", "pin-project-lite", "socket2", "tokio", @@ -3679,7 +3769,7 @@ checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ "ct-logs", "futures-util", - "hyper 0.14.20", + "hyper 0.14.23", "log 0.4.17", "rustls 0.19.1", "rustls-native-certs", @@ -3690,13 +3780,13 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d" dependencies = [ "http", - "hyper 0.14.20", - "rustls 0.20.6", + "hyper 0.14.23", + "rustls 0.20.7", "tokio", "tokio-rustls 0.23.4", ] @@ -3707,7 +3797,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.20", + "hyper 0.14.23", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -3720,7 +3810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.1.0", - "hyper 0.14.20", + "hyper 0.14.23", "native-tls", "tokio", "tokio-native-tls", @@ -3732,7 +3822,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5617e92fc2f2501c3e2bc6ce547cad841adba2bae5b921c7e52510beca6d084c" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bytes 1.1.0", "http", "httpdate", @@ -3744,17 +3834,28 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.50" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", + "iana-time-zone-haiku", "js-sys", "wasm-bindgen", "winapi 0.3.9", ] +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "ide-ci" version = "0.1.0" @@ -3768,7 +3869,7 @@ dependencies = [ "cached", "cfg-if 1.0.0", "chrono", - "clap 3.1.15", + "clap 3.2.23", "convert_case 0.6.0", "cron", "data-encoding", @@ -3780,7 +3881,7 @@ dependencies = [ "flate2", "flume", "fs_extra", - "futures 0.3.24", + "futures 0.3.25", "futures-util", "glob", "graphql_client", @@ -3829,7 +3930,7 @@ dependencies = [ "tracing-subscriber", "unicase 2.6.0", "url 2.3.0", - "uuid 1.1.2", + "uuid 1.2.2", "walkdir", "warp", "which", @@ -3937,7 +4038,7 @@ version = "0.1.0" dependencies = [ "analytics", "ast", - "base64 0.13.0", + "base64 0.13.1", "bimap", "engine-protocol", "enso-config", @@ -4024,9 +4125,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg 1.1.0", "hashbrown", @@ -4034,12 +4135,13 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfddc9561e8baf264e0e45e197fd7696320026eb10a8180340debc27b18f535b" +checksum = "4295cbb7573c16d310e99e713cf9e75101eb190ab31fccd35f2d2691b4352b19" dependencies = [ "console", "number_prefix", + "portable-atomic", "unicode-width", ] @@ -4065,6 +4167,12 @@ dependencies = [ "toml", ] +[[package]] +name = "io-lifetimes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" + [[package]] name = "iovec" version = "0.1.4" @@ -4076,9 +4184,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" [[package]] name = "itertools" @@ -4115,9 +4223,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "jni" @@ -4158,7 +4266,7 @@ dependencies = [ "enso-shapely", "enso-web", "failure", - "futures 0.3.24", + "futures 0.3.25", "serde", "serde_json", "shrinkwraprs 0.3.0", @@ -4170,7 +4278,7 @@ version = "8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aa4b4af834c6cfd35d8763d359661b90f2e45d8f750a0849156c7f4671af09c" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "pem", "ring", "serde", @@ -4180,9 +4288,12 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "kernel32-sys" @@ -4261,15 +4372,24 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.126" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libm" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" + +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] [[package]] name = "linked-hash-map" @@ -4277,6 +4397,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linux-raw-sys" +version = "0.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" + [[package]] name = "lock_api" version = "0.3.4" @@ -4319,11 +4445,11 @@ dependencies = [ name = "logstat" version = "0.1.0" dependencies = [ - "clap 3.1.15", + "clap 3.2.23", "enso-prelude", "lazy_static", "regex", - "time 0.3.14", + "time 0.3.17", "tokio", "tokio-stream", ] @@ -4370,7 +4496,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -4388,6 +4514,15 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg 1.1.0", +] + [[package]] name = "mime" version = "0.2.6" @@ -4449,14 +4584,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log 0.4.17", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -4479,7 +4614,7 @@ checksum = "01458f8a19b10cb28195290942e3149161c75acf67ebc8fbf714ab67a2b943bc" dependencies = [ "cfg-if 0.1.10", "downcast", - "fragile", + "fragile 1.2.2", "lazy_static", "mockall_derive", "predicates", @@ -4544,14 +4679,14 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -4567,9 +4702,9 @@ dependencies = [ [[package]] name = "net2" -version = "0.2.37" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" dependencies = [ "cfg-if 0.1.10", "libc", @@ -4595,7 +4730,7 @@ dependencies = [ "bitflags", "cfg-if 1.0.0", "libc", - "memoffset", + "memoffset 0.6.5", ] [[package]] @@ -4623,6 +4758,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + [[package]] name = "num" version = "0.4.0" @@ -4723,9 +4868,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ "hermit-abi", "libc", @@ -4752,15 +4897,6 @@ dependencies = [ "syn", ] -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - [[package]] name = "number_prefix" version = "0.4.0" @@ -4792,7 +4928,7 @@ source = "git+https://github.com/enso-org/octocrab#88f81c840085ce0aa591f9f53d6c6 dependencies = [ "arc-swap", "async-trait", - "base64 0.13.0", + "base64 0.13.1", "bytes 1.1.0", "cfg-if 1.0.0", "chrono", @@ -4810,9 +4946,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "oorandom" @@ -4860,9 +4996,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.76" +version = "0.9.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" +checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" dependencies = [ "autocfg 1.1.0", "cc", @@ -4873,18 +5009,18 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.1.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ffdb14730ed2ef599c65810c15b000896e21e8776b512de0db0c3d7335cc2a" +checksum = "d84eb1409416d254e4a9c8fa56cc24701755025b458f0fcd8e59e1f5f40c23bf" dependencies = [ "num-traits", ] [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "ouroboros" @@ -4909,6 +5045,12 @@ dependencies = [ "syn", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "owned_ttf_parser" version = "0.15.2" @@ -4942,7 +5084,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api 0.4.9", - "parking_lot_core 0.9.3", + "parking_lot_core 0.9.4", ] [[package]] @@ -4962,15 +5104,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.2.16", - "smallvec 1.9.0", - "windows-sys", + "smallvec 1.10.0", + "windows-sys 0.42.0", ] [[package]] @@ -4985,7 +5127,7 @@ dependencies = [ "enso-profiler", "enso-text", "failure", - "futures 0.3.24", + "futures 0.3.25", "ide-ci", "js-sys", "matches", @@ -5027,9 +5169,9 @@ dependencies = [ [[package]] name = "path-absolutize" -version = "3.0.13" +version = "3.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3de4b40bd9736640f14c438304c09538159802388febb02c8abaae0846c1f13" +checksum = "0f1d4993b16f7325d90c18c3c6a3327db7808752db8d208cea0acee0abd52c52" dependencies = [ "path-dedot", ] @@ -5042,9 +5184,9 @@ checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd" [[package]] name = "path-dedot" -version = "3.0.17" +version = "3.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d611d5291372b3738a34ebf0d1f849e58b1dcc1101032f76a346eaa1f8ddbb5b" +checksum = "9a81540d94551664b72b72829b12bd167c73c9d25fbac0e04fafa8023f7e4901" dependencies = [ "once_cell", ] @@ -5067,7 +5209,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", ] [[package]] @@ -5116,15 +5258,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "platforms" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8ec293fd25f7fcfeb7c70129241419a62c6200a26a725f680aff07c91d0ed05" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" dependencies = [ "serde", ] @@ -5159,9 +5301,9 @@ dependencies = [ [[package]] name = "polling" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011" +checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" dependencies = [ "autocfg 1.1.0", "cfg-if 1.0.0", @@ -5178,10 +5320,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6519412c9e0d4be579b9f0618364d19cb434b324fc6ddb1b27b1e682c7105ed" [[package]] -name = "ppv-lite86" -version = "0.2.16" +name = "portable-atomic" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" @@ -5198,15 +5346,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb" +checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" [[package]] name = "predicates-tree" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" dependencies = [ "predicates-core", "termtree", @@ -5265,18 +5413,18 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" +checksum = "a0841812012b2d4a6145fae9a6af1534873c32aa67fff26bd09f8fa42c83f95a" dependencies = [ "bytes 1.1.0", "prost-derive", @@ -5284,9 +5432,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" +checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" dependencies = [ "anyhow", "itertools 0.10.5", @@ -5297,9 +5445,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" +checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" dependencies = [ "bytes 1.1.0", "prost", @@ -5444,7 +5592,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] @@ -5536,11 +5684,10 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" dependencies = [ - "autocfg 1.1.0", "crossbeam-deque", "either", "rayon-core", @@ -5548,13 +5695,13 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel", "crossbeam-deque", - "crossbeam-utils 0.8.11", + "crossbeam-utils 0.8.14", "num_cpus", ] @@ -5588,16 +5735,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -5615,9 +5762,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remove_dir_all" @@ -5630,11 +5777,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.12" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" +checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bytes 1.1.0", "encoding_rs", "futures-core", @@ -5642,8 +5789,8 @@ dependencies = [ "h2", "http", "http-body", - "hyper 0.14.20", - "hyper-rustls 0.23.0", + "hyper 0.14.23", + "hyper-rustls 0.23.1", "hyper-tls", "ipnet", "js-sys", @@ -5653,7 +5800,7 @@ dependencies = [ "once_cell", "percent-encoding 2.1.0", "pin-project-lite", - "rustls 0.20.6", + "rustls 0.20.7", "rustls-pemfile 1.0.1", "serde", "serde_json", @@ -5722,13 +5869,27 @@ dependencies = [ "semver 1.0.14", ] +[[package]] +name = "rustix" +version = "0.35.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.42.0", +] + [[package]] name = "rustls" version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "log 0.4.17", "ring", "sct 0.6.1", @@ -5737,9 +5898,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" dependencies = [ "log 0.4.17", "ring", @@ -5765,7 +5926,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", ] [[package]] @@ -5774,7 +5935,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", ] [[package]] @@ -5791,7 +5952,7 @@ checksum = "a617c811f5c9a7060fe511d35d13bf5b9f0463ce36d63ce666d05779df2b4eba" dependencies = [ "bitflags", "bytemuck", - "smallvec 1.9.0", + "smallvec 1.10.0", "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", @@ -5827,14 +5988,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] name = "scoped-tls" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" @@ -5842,6 +6003,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + [[package]] name = "sct" version = "0.6.1" @@ -5926,9 +6093,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" dependencies = [ "serde_derive", ] @@ -5945,9 +6112,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", @@ -5956,11 +6123,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ - "itoa 1.0.3", + "itoa 1.0.4", "ryu", "serde", ] @@ -5992,7 +6159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.3", + "itoa 1.0.4", "ryu", "serde", ] @@ -6016,12 +6183,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d232d893b10de3eb7258ff01974d6ee20663d8e833263c99409d4b13a0209da" dependencies = [ "indexmap", - "itoa 1.0.3", + "itoa 1.0.4", "ryu", "serde", "unsafe-libyaml", ] +[[package]] +name = "sha-1" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +dependencies = [ + "block-buffer 0.7.3", + "digest 0.8.1", + "fake-simd", + "opaque-debug", +] + [[package]] name = "sha-1" version = "0.10.0" @@ -6030,7 +6209,7 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -6050,7 +6229,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -6067,7 +6246,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -6148,7 +6327,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.14", + "time 0.3.17", ] [[package]] @@ -6171,15 +6350,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snafu" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5177903bf45656592d9eb5c0e22f408fc023aae51dbe2088889b71633ba451f2" +checksum = "a152ba99b054b22972ee794cf04e5ef572da1229e33b65f3c57abbff0525a454" dependencies = [ "backtrace", "doc-comment", @@ -6188,9 +6367,9 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410b26ed97440d90ced3e2488c868d56a86e2064f5d7d6f417909b286afe25e5" +checksum = "d5e79cdebbabaebb06a9bdbaedc7f159b410461f63611d4d0e3fb0fab8fed850" dependencies = [ "heck", "proc-macro2", @@ -6210,11 +6389,11 @@ dependencies = [ [[package]] name = "sourcemap" -version = "6.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad6f449ac2dc2eaa01e766408b76b55fc0a20c842b63aa11a8448caa72f50b" +checksum = "c46fdc1838ff49cf692226f5c2b0f5b7538f556863d0eca602984714667ac6e7" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "if_chain", "lazy_static", "regex", @@ -6289,9 +6468,9 @@ checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" [[package]] name = "syn" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" dependencies = [ "proc-macro2", "quote", @@ -6318,9 +6497,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.26.4" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7890fff842b8db56f2033ebee8f6efe1921475c3830c115995552914fb967580" +checksum = "c375d5fd899e32847b8566e10598d6e9f1d9b55ec6de3cdf9e7da4bdc51371bc" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -6376,10 +6555,20 @@ dependencies = [ ] [[package]] -name = "termtree" -version = "0.2.4" +name = "terminal_size" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" +checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" +dependencies = [ + "rustix", + "windows-sys 0.42.0", +] + +[[package]] +name = "termtree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "textwrap" @@ -6392,11 +6581,11 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ - "terminal_size", + "terminal_size 0.2.2", ] [[package]] @@ -6441,21 +6630,30 @@ dependencies = [ [[package]] name = "time" -version = "0.3.14" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ - "itoa 1.0.3", - "libc", - "num_threads", + "itoa 1.0.4", + "serde", + "time-core", "time-macros", ] [[package]] -name = "time-macros" -version = "0.2.4" +name = "time-core" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] [[package]] name = "tinytemplate" @@ -6492,7 +6690,7 @@ dependencies = [ "bytes 1.1.0", "libc", "memchr", - "mio 0.8.4", + "mio 0.8.5", "num_cpus", "once_cell", "parking_lot 0.12.1", @@ -6603,16 +6801,16 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.6", + "rustls 0.20.7", "tokio", "webpki 0.22.0", ] [[package]] name = "tokio-stream" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" dependencies = [ "futures-core", "pin-project-lite", @@ -6695,21 +6893,21 @@ dependencies = [ [[package]] name = "tonic" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11cd56bdb54ef93935a6a79dbd1d91f1ebd4c64150fd61654031fd6b8b775c91" +checksum = "55b9af819e54b8f33d453655bef9b9acc171568fb49523078d0cc4e7484200ec" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.13.0", + "base64 0.13.1", "bytes 1.1.0", "futures-core", "futures-util", "h2", "http", "http-body", - "hyper 0.14.20", + "hyper 0.14.23", "hyper-timeout", "percent-encoding 2.1.0", "pin-project", @@ -6766,9 +6964,9 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" @@ -6833,16 +7031,16 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ - "ansi_term", "matchers", + "nu-ansi-term", "once_cell", "regex", "sharded-slab", - "smallvec 1.9.0", + "smallvec 1.10.0", "thread_local", "tracing", "tracing-core", @@ -6884,14 +7082,14 @@ version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "byteorder", "bytes 1.1.0", "http", "httparse", "log 0.4.17", "rand 0.8.5", - "sha-1", + "sha-1 0.10.0", "thiserror", "url 2.3.0", "utf-8", @@ -6962,9 +7160,9 @@ checksum = "07547e3ee45e28326cc23faac56d44f58f16ab23e413db526debce3b0bfd2742" [[package]] name = "unicode-ident" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "unicode-normalization" @@ -7067,18 +7265,18 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "serde", "sha1 0.6.1", ] [[package]] name = "uuid" -version = "1.1.2" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "serde", ] @@ -7118,9 +7316,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "virtue" -version = "0.0.7" +version = "0.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "757cfbfe0d17ee6f22fe97e536d463047d451b47cf9d11e2b7d1398b0ef274dd" +checksum = "7b60dcd6a64dd45abf9bd426970c9843726da7fc08f44cd6fcebf68c21220a63" [[package]] name = "void" @@ -7166,7 +7364,7 @@ dependencies = [ "futures-util", "headers", "http", - "hyper 0.14.20", + "hyper 0.14.23", "log 0.4.17", "mime 0.3.16", "mime_guess", @@ -7343,19 +7541,15 @@ dependencies = [ [[package]] name = "websocket" -version = "0.23.0" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b255b190f412e45000c35be7fe9b48b39a2ac5eb90d093d421694e5dae8b335c" +checksum = "92aacab060eea423e4036820ddd28f3f9003b2c4d8048cbda985e5a14e18038d" dependencies = [ - "base64 0.10.1", - "bitflags", - "byteorder", "bytes 0.4.12", "futures 0.1.31", "hyper 0.10.16", "native-tls", "rand 0.6.5", - "sha1 0.6.1", "tokio-codec", "tokio-io", "tokio-reactor", @@ -7363,6 +7557,27 @@ dependencies = [ "tokio-tls", "unicase 1.4.2", "url 1.7.2", + "websocket-base", +] + +[[package]] +name = "websocket-base" +version = "0.26.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49aec794b07318993d1db16156d5a9c750120597a5ee40c6b928d416186cb138" +dependencies = [ + "base64 0.10.1", + "bitflags", + "byteorder", + "bytes 0.4.12", + "futures 0.1.31", + "native-tls", + "rand 0.6.5", + "sha-1 0.8.2", + "tokio-codec", + "tokio-io", + "tokio-tcp", + "tokio-tls", ] [[package]] @@ -7371,7 +7586,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2108c9c18a6e746addc085c18cedb66b672e8ffea6a993712decc295b0d8ae55" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "byteorder", "bytes 1.1.0", "httparse", @@ -7386,9 +7601,9 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6cae39139c6e837afebd915935e7adc8af5c28425935de606d0e8c9d3268f6" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bytes 1.1.0", - "futures 0.3.24", + "futures 0.3.25", "native-tls", "rand 0.8.5", "tokio", @@ -7488,43 +7703,100 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + [[package]] name = "windows_i686_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + [[package]] name = "windows_i686_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "winreg" version = "0.10.1" @@ -7536,18 +7808,18 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc3c7b7557dbfdad6431b5a51196c9110cef9d83f6a9b26699f35cdc0ae113ec" +checksum = "249dc68542861d17eae4b4e5e8fb381c2f9e8f255a84f6771d5fdf8b6c03ce3c" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.13.0", + "base64 0.13.1", "deadpool", - "futures 0.3.24", + "futures 0.3.25", "futures-timer", "http-types", - "hyper 0.14.20", + "hyper 0.14.23", "log 0.4.17", "once_cell", "regex", @@ -7570,13 +7842,13 @@ dependencies = [ name = "wstest" version = "0.1.0" dependencies = [ - "base64 0.13.0", - "clap 3.1.15", + "base64 0.13.1", + "clap 3.2.23", "either", "enso-prelude", - "futures 0.3.24", + "futures 0.3.25", "regex", - "time 0.3.14", + "time 0.3.17", "tokio", "tokio-stream", "url 2.3.0", @@ -7627,12 +7899,12 @@ checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" [[package]] name = "zip" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf225bcf73bb52cbb496e70475c7bd7a3f769df699c0020f6c7bd9a96dcf0b8d" +checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080" dependencies = [ "byteorder", "crc32fast", - "crossbeam-utils 0.8.11", + "crossbeam-utils 0.8.14", "flate2", ] diff --git a/app/gui/Cargo.toml b/app/gui/Cargo.toml index 93f0719e00c..28a43d04255 100644 --- a/app/gui/Cargo.toml +++ b/app/gui/Cargo.toml @@ -58,7 +58,7 @@ wasm-bindgen = { version = "=0.2.78" } wasm-bindgen-futures = "0.4" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -websocket = "0.23.0" +websocket = "0.26.5" [dev-dependencies] regex = { version = "1.3.6" } diff --git a/app/gui/controller/double-representation/src/text.rs b/app/gui/controller/double-representation/src/text.rs index f70d54f98f4..1c35584d94a 100644 --- a/app/gui/controller/double-representation/src/text.rs +++ b/app/gui/controller/double-representation/src/text.rs @@ -248,7 +248,7 @@ mod test { apply_code_change_to_id_map(&mut id_map, &self.change, &self.code); let code2 = self.resulting_code(); - let ast2 = parser.parse_module(&code2, id_map.clone()).unwrap(); + let ast2 = parser.parse_module(code2, id_map.clone()).unwrap(); self.assert_same_node_ids(&ast1, &ast2); } diff --git a/app/gui/controller/engine-protocol/build.rs b/app/gui/controller/engine-protocol/build.rs index 17627a4deac..b0aecde7f82 100644 --- a/app/gui/controller/engine-protocol/build.rs +++ b/app/gui/controller/engine-protocol/build.rs @@ -86,7 +86,7 @@ impl ApiProvider { /// Generates rust files from FlatBuffers schemas. pub fn generate_files(&self) { let fbs_dir = self.out_dir.join(ZIP_CONTENT); - for entry in fs::read_dir(&fbs_dir).expect("Could not read content of dir") { + for entry in fs::read_dir(fbs_dir).expect("Could not read content of dir") { let path = entry.expect("Invalid content of dir").path(); let result = flatc_rust::run(flatc_rust::Args { inputs: &[&path], diff --git a/app/gui/controller/engine-protocol/src/binary/client.rs b/app/gui/controller/engine-protocol/src/binary/client.rs index 405b75b1a34..fd034aa9929 100644 --- a/app/gui/controller/engine-protocol/src/binary/client.rs +++ b/app/gui/controller/engine-protocol/src/binary/client.rs @@ -269,7 +269,7 @@ mod tests { fn new() -> ClientFixture { let logger = Logger::new("ClientFixture"); let transport = MockTransport::new(); - let client = Client::new(&logger, transport.clone()); + let client = Client::new(logger, transport.clone()); let executor = futures::executor::LocalPool::new(); executor.spawner().spawn_local(client.runner()).unwrap(); ClientFixture { transport, client, executor } diff --git a/app/gui/controller/engine-protocol/src/language_server/types.rs b/app/gui/controller/engine-protocol/src/language_server/types.rs index 86757efee76..22467d0e8a8 100644 --- a/app/gui/controller/engine-protocol/src/language_server/types.rs +++ b/app/gui/controller/engine-protocol/src/language_server/types.rs @@ -108,7 +108,7 @@ impl Path { // ==================== /// Notification generated by the Language Server. -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, IntoStaticStr, Eq)] +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, IntoStaticStr)] #[serde(tag = "method", content = "params")] pub enum Notification { /// Filesystem event occurred for a watched path. @@ -190,7 +190,7 @@ pub struct VisualisationEvaluationFailed { /// Sent from the server to the client to inform about new information for certain expressions /// becoming available. -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, Eq)] +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] #[allow(missing_docs)] #[serde(rename_all = "camelCase")] pub struct ExpressionUpdates { @@ -199,7 +199,7 @@ pub struct ExpressionUpdates { } /// An update about the computed expression. -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, Eq)] +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] #[allow(missing_docs)] #[serde(rename_all = "camelCase")] pub struct ExpressionUpdate { @@ -223,7 +223,7 @@ pub enum ProfilingInfo { ExecutionTime { nano_time: u64 }, } -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, Eq)] +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] #[allow(missing_docs)] #[serde(tag = "type")] pub enum ExpressionUpdatePayload { diff --git a/app/gui/language/ast/impl/src/id_map.rs b/app/gui/language/ast/impl/src/id_map.rs index 5c9ed4e7ed4..5dcbf0fd2fe 100644 --- a/app/gui/language/ast/impl/src/id_map.rs +++ b/app/gui/language/ast/impl/src/id_map.rs @@ -92,8 +92,8 @@ impl JsonIdMap { let mut cursor = xi_rope::Cursor::new(&code.rope, 0); let char_offsets = iter::once(0).chain(cursor.iter::()).collect_vec(); let mapped_vec = id_map.vec.iter().map(|(range, id)| { - let byte_start = range.start.value as usize; - let byte_end = range.end.value as usize; + let byte_start = range.start.value; + let byte_end = range.end.value; let start = char_offsets.binary_search(&byte_start).unwrap_both(); let end = char_offsets.binary_search(&byte_end).unwrap_both(); let size = end - start; diff --git a/app/gui/language/parser/Cargo.toml b/app/gui/language/parser/Cargo.toml index 2fa821e97d7..499aa75bee5 100644 --- a/app/gui/language/parser/Cargo.toml +++ b/app/gui/language/parser/Cargo.toml @@ -35,4 +35,4 @@ reqwest = { version = "0.11.12" } tokio = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -websocket = "0.23.0" +websocket = "0.26.5" diff --git a/app/gui/src/model/execution_context.rs b/app/gui/src/model/execution_context.rs index d7bb738f681..8ec2cefae3c 100644 --- a/app/gui/src/model/execution_context.rs +++ b/app/gui/src/model/execution_context.rs @@ -581,7 +581,7 @@ mod tests { // Set two errors. One of old values is overridden let update1 = value_update_with_dataflow_error(expr2); - let update2 = value_update_with_dataflow_panic(expr3, &error_msg); + let update2 = value_update_with_dataflow_panic(expr3, error_msg); registry.apply_updates(vec![update1, update2]); assert_eq!(registry.get(&expr1).unwrap().typename, Some(typename1.into())); assert!(matches!(registry.get(&expr1).unwrap().payload, ExpressionUpdatePayload::Value)); diff --git a/app/gui/view/graph-editor/src/component/edge.rs b/app/gui/view/graph-editor/src/component/edge.rs index 5aab6e69d3e..3049ee9e53c 100644 --- a/app/gui/view/graph-editor/src/component/edge.rs +++ b/app/gui/view/graph-editor/src/component/edge.rs @@ -248,8 +248,8 @@ impl FocusedEdge { fn fill>>(&self, focused_color: C, unfocused_color: C) -> AnyShape { let focused_color = focused_color.into(); let unfocused_color = unfocused_color.into(); - let focused = self.focused.fill(&focused_color); - let unfocused = self.unfocused.fill(&unfocused_color); + let focused = self.focused.fill(focused_color); + let unfocused = self.unfocused.fill(unfocused_color); (focused + unfocused).into() } } diff --git a/app/gui/view/graph-editor/src/component/node.rs b/app/gui/view/graph-editor/src/component/node.rs index 715614f47ca..3726d5ca163 100644 --- a/app/gui/view/graph-editor/src/component/node.rs +++ b/app/gui/view/graph-editor/src/component/node.rs @@ -114,7 +114,7 @@ pub mod background { let width = width - PADDING.px() * 2.0; let height = height - PADDING.px() * 2.0; let radius = RADIUS.px(); - let shape = Rect((&width,&height)).corners_radius(&radius); + let shape = Rect((&width,&height)).corners_radius(radius); let shape = shape.fill(bg_color); shape.into() } @@ -151,12 +151,12 @@ pub mod backdrop { let sel_width = &width - 2.px() + &sel_offset.px() * 2.0 * &selection; let sel_height = &height - 2.px() + &sel_offset.px() * 2.0 * &selection; let sel_radius = &sel_height / 2.0; - let select = Rect((&sel_width,&sel_height)).corners_radius(&sel_radius); + let select = Rect((&sel_width,&sel_height)).corners_radius(sel_radius); let sel2_width = &width - 2.px() + &(sel_size + sel_offset).px() * 2.0 * &selection; let sel2_height = &height - 2.px() + &(sel_size + sel_offset).px() * 2.0 * &selection; let sel2_radius = &sel2_height / 2.0; - let select2 = Rect((&sel2_width,&sel2_height)).corners_radius(&sel2_radius); + let select2 = Rect((&sel2_width,&sel2_height)).corners_radius(sel2_radius); let select = select2 - select; let select = select.fill(sel_color); @@ -233,7 +233,7 @@ pub mod error_shape { let stripe_red = Rect((&stripe_width,INFINITE.px())); let stripe_angle_rad = stripe_angle.radians(); let pattern = stripe_red.repeat(repeat).rotate(stripe_angle_rad); - let mask = Rect((&width,&height)).corners_radius(&radius); + let mask = Rect((&width,&height)).corners_radius(radius); let mask = mask.grow(error_width); let pattern = mask.intersection(pattern).fill(color_rgba); diff --git a/app/gui/view/graph-editor/src/component/node/action_bar/icon.rs b/app/gui/view/graph-editor/src/component/node/action_bar/icon.rs index 53f53dba78f..d553e3f073d 100644 --- a/app/gui/view/graph-editor/src/component/node/action_bar/icon.rs +++ b/app/gui/view/graph-editor/src/component/node/action_bar/icon.rs @@ -23,7 +23,7 @@ pub mod visibility { let outer_radius = &unit*5.0; let pupil = Circle(&unit * 1.0); let inner_circle = Circle(&unit * 3.0); - let outer_circle = Circle(&outer_radius); + let outer_circle = Circle(outer_radius); let right_edge = Triangle(&unit * 7.9, &unit * 4.6); let right_edge = right_edge.rotate(right_angle); let right_edge = right_edge.translate_x(&unit * 5.3); @@ -82,8 +82,8 @@ fn make_ring>, U: Into>>( outer_radius: T, inner_radius: U, ) -> AnyShape { - let outer_circle = Circle(&outer_radius.into()); - let inner_circle = Circle(&inner_radius.into()); + let outer_circle = Circle(outer_radius.into()); + let inner_circle = Circle(inner_radius.into()); let ring = outer_circle - inner_circle; ring.into() } diff --git a/app/gui/view/graph-editor/src/component/node/output/port.rs b/app/gui/view/graph-editor/src/component/node/output/port.rs index cc288e79475..e1c0521879f 100644 --- a/app/gui/view/graph-editor/src/component/node/output/port.rs +++ b/app/gui/view/graph-editor/src/component/node/output/port.rs @@ -102,7 +102,7 @@ impl AllPortsShape { let port_area_height = &inner_height + (&port_area_size - &shrink) * 2.0; let outer_radius = &inner_radius + &port_area_size; let shape = Rect((&port_area_width, &port_area_height)); - let shape = shape.corners_radius(&outer_radius); + let shape = shape.corners_radius(outer_radius); let shape = shape - &top_mask; let corner_radius = &port_area_size / 2.0; let corner_offset = &port_area_width / 2.0 - &corner_radius; @@ -115,7 +115,7 @@ impl AllPortsShape { // === Hover Area === let hover_radius = &inner_radius + &HOVER_AREA_PADDING.px(); - let hover = Rect((canvas_width, canvas_height)).corners_radius(&hover_radius); + let hover = Rect((canvas_width, canvas_height)).corners_radius(hover_radius); let hover = (hover - &top_mask).into(); AllPortsShape { inner_radius, inner_width, shape, hover } diff --git a/app/gui/view/graph-editor/src/component/node/vcs.rs b/app/gui/view/graph-editor/src/component/node/vcs.rs index 858653e4059..9588a67d9af 100644 --- a/app/gui/view/graph-editor/src/component/node/vcs.rs +++ b/app/gui/view/graph-editor/src/component/node/vcs.rs @@ -65,7 +65,7 @@ mod status_indicator_shape { let height = height - node::PADDING.px() * 2.0; let radius = node::RADIUS.px(); - let base = Rect((&width,&height)).corners_radius(&radius); + let base = Rect((&width,&height)).corners_radius(radius); let outer = base.grow(INDICATOR_WIDTH_OUTER.px()); let inner = base.grow(INDICATOR_WIDTH_INNER.px()); diff --git a/app/gui/view/graph-editor/src/component/profiling.rs b/app/gui/view/graph-editor/src/component/profiling.rs index de708358a38..c68e1d95762 100644 --- a/app/gui/view/graph-editor/src/component/profiling.rs +++ b/app/gui/view/graph-editor/src/component/profiling.rs @@ -84,7 +84,7 @@ mod icon { let needle = UnevenCapsule(needle_radius_outer,needle_radius_inner,needle_length); let needle = needle.rotate(needle_angle); - let inner_circle = Circle(&inner_circle_radius); + let inner_circle = Circle(inner_circle_radius); // === Composition === diff --git a/app/gui/view/graph-editor/src/component/visualization/container.rs b/app/gui/view/graph-editor/src/component/visualization/container.rs index c4a4adebbeb..ce7f9472695 100644 --- a/app/gui/view/graph-editor/src/component/visualization/container.rs +++ b/app/gui/view/graph-editor/src/component/visualization/container.rs @@ -67,7 +67,7 @@ pub mod overlay { let radius = 1.px() * &radius; let corner_radius = &radius * &roundness; let color_overlay = color::Rgba::new(1.0,0.0,0.0,0.000_000_1); - let overlay = Rect((&width,&height)).corners_radius(&corner_radius); + let overlay = Rect((&width,&height)).corners_radius(corner_radius); let overlay = overlay.fill(color_overlay); let out = overlay; out.into() @@ -101,12 +101,12 @@ pub mod background { let sel_width = &width - 1.px() + &sel_offset.px() * 2.0 * &selection; let sel_height = &height - 1.px() + &sel_offset.px() * 2.0 * &selection; let sel_radius = &corner_radius + &sel_offset.px(); - let select = Rect((&sel_width,&sel_height)).corners_radius(&sel_radius); + let select = Rect((&sel_width,&sel_height)).corners_radius(sel_radius); let sel2_width = &width - 2.px() + &(sel_size + sel_offset).px() * 2.0 * &selection; let sel2_height = &height - 2.px() + &(sel_size + sel_offset).px() * 2.0 * &selection; let sel2_radius = &corner_radius + &sel_offset.px() + &sel_size.px() * &selection; - let select2 = Rect((&sel2_width,&sel2_height)).corners_radius(&sel2_radius); + let select2 = Rect((&sel2_width,&sel2_height)).corners_radius(sel2_radius); let select = select2 - select; let select = select.fill(sel_color); diff --git a/app/gui/view/graph-editor/src/component/visualization/container/action_bar.rs b/app/gui/view/graph-editor/src/component/visualization/container/action_bar.rs index 7c350d74ebb..e919334b80a 100644 --- a/app/gui/view/graph-editor/src/component/visualization/container/action_bar.rs +++ b/app/gui/view/graph-editor/src/component/visualization/container/action_bar.rs @@ -62,7 +62,7 @@ mod background { let width = Var::::from("input_size.x"); let height = Var::::from("input_size.y"); let radius = node::RADIUS.px() ; - let background_rounded = Rect((&width,&height)).corners_radius(&radius); + let background_rounded = Rect((&width,&height)).corners_radius(radius); let background_sharp = Rect((&width,&height/2.0)).translate_y(-&height/4.0); let background = background_rounded + background_sharp; let color_path = theme::graph_editor::visualization::action_bar::background; diff --git a/app/gui/view/graph-editor/src/component/visualization/container/fullscreen.rs b/app/gui/view/graph-editor/src/component/visualization/container/fullscreen.rs index 6fd45532b34..226aa7621b9 100644 --- a/app/gui/view/graph-editor/src/component/visualization/container/fullscreen.rs +++ b/app/gui/view/graph-editor/src/component/visualization/container/fullscreen.rs @@ -35,7 +35,7 @@ pub mod background { let color_path = theme::graph_editor::visualization::background; let color_bg = style.get_color(color_path); let corner_radius = &radius * &roundness; - let background = Rect((&width,&height)).corners_radius(&corner_radius); + let background = Rect((&width,&height)).corners_radius(corner_radius); let background = background.fill(color_bg); background.into() } diff --git a/app/gui/view/src/window_control_buttons/fullscreen.rs b/app/gui/view/src/window_control_buttons/fullscreen.rs index fbde9217a49..4a52c2e4a30 100644 --- a/app/gui/view/src/window_control_buttons/fullscreen.rs +++ b/app/gui/view/src/window_control_buttons/fullscreen.rs @@ -24,7 +24,7 @@ pub mod shape { let size = Var::canvas_size(); let radius = Min::min(size.x(),size.y()) / 2.0; let round = &radius / 6.0; - let rect = Rect((&radius,&radius)).corners_radius(&round); + let rect = Rect((&radius,&radius)).corners_radius(round); let strip_sizes = (&radius * 2.0 / 9.0, &radius*2.0); let strip = Rect(strip_sizes).rotate(Radians::from(45.0.degrees())); let icon = rect - strip; diff --git a/build/base/src/fs.rs b/build/base/src/fs.rs index bc6910ec5a5..d8c8dd7a2c0 100644 --- a/build/base/src/fs.rs +++ b/build/base/src/fs.rs @@ -31,7 +31,7 @@ pub fn write(path: impl AsRef, contents: impl AsRef<[u8]>) -> Result { #[context("Failed to write path: {}", path.as_ref().display())] pub fn write_json(path: impl AsRef, contents: &impl Serialize) -> Result { let contents = serde_json::to_string(contents)?; - write(&path, &contents) + write(&path, contents) } /// Like the standard version but will create any missing parent directories from the path. diff --git a/build/build/examples/artifact.rs b/build/build/examples/artifact.rs index 4cfa814ba34..504f3c31e97 100644 --- a/build/build/examples/artifact.rs +++ b/build/build/examples/artifact.rs @@ -68,6 +68,6 @@ async fn main() -> Result { downloader.download_all_to(temp.path()).await?; let expected_path = temp.path().join(artifact_name); - assert_eq!(std::fs::read(&expected_path)?, std::fs::read(&file)?); + assert_eq!(std::fs::read(expected_path)?, std::fs::read(&file)?); Ok(()) } diff --git a/build/build/src/aws/s3.rs b/build/build/src/aws/s3.rs index db720704bc3..d5c2da72fae 100644 --- a/build/build/src/aws/s3.rs +++ b/build/build/src/aws/s3.rs @@ -171,7 +171,7 @@ impl ContentHeaders { if let Some(content_encoding) = self.content_encoding() { request = request.content_encoding(content_encoding); } - request.content_type(&self.content_type.to_string()) + request.content_type(self.content_type.to_string()) } } diff --git a/build/build/src/enso.rs b/build/build/src/enso.rs index c26bdb19f35..017ecbaa666 100644 --- a/build/build/src/enso.rs +++ b/build/build/src/enso.rs @@ -86,7 +86,7 @@ impl BuiltEnso { let google_api_test_data_dir = paths.repo_root.join("test").join("Google_Api_Test").join("data"); ide_ci::fs::create_dir_if_missing(&google_api_test_data_dir)?; - ide_ci::fs::write(google_api_test_data_dir.join("secret.json"), &gdoc_key)?; + ide_ci::fs::write(google_api_test_data_dir.join("secret.json"), gdoc_key)?; } let _httpbin = crate::httpbin::get_and_spawn_httpbin_on_free_port(sbt).await?; diff --git a/build/build/src/lib.rs b/build/build/src/lib.rs index f5a4b75facb..78536fbc1c8 100644 --- a/build/build/src/lib.rs +++ b/build/build/src/lib.rs @@ -9,7 +9,6 @@ #![feature(option_result_contains)] #![feature(result_flattening)] #![feature(default_free_fn)] -#![feature(map_first_last)] #![feature(result_option_inspect)] #![feature(associated_type_defaults)] #![feature(once_cell)] diff --git a/build/build/src/version.rs b/build/build/src/version.rs index 06d7e4b8b21..c2c76e6d4f6 100644 --- a/build/build/src/version.rs +++ b/build/build/src/version.rs @@ -232,7 +232,7 @@ pub fn base_version(changelog_path: impl AsRef) -> Result { } pub fn current_year() -> u64 { - chrono::Utc::today().year() as u64 + chrono::Utc::now().year() as u64 } pub fn generate_initial_version() -> Version { diff --git a/build/ci_utils/src/env.rs b/build/ci_utils/src/env.rs index 4146cbbba17..bd2812e6515 100644 --- a/build/ci_utils/src/env.rs +++ b/build/ci_utils/src/env.rs @@ -204,7 +204,7 @@ pub mod new { } } - impl const RawVariable for SimpleVariable { + impl RawVariable for SimpleVariable { fn name(&self) -> &str { self.name } diff --git a/build/ci_utils/src/extensions/os.rs b/build/ci_utils/src/extensions/os.rs index 3abce4d97e2..73457c950f2 100644 --- a/build/ci_utils/src/extensions/os.rs +++ b/build/ci_utils/src/extensions/os.rs @@ -4,6 +4,7 @@ use crate::prelude::*; /// A bunch of constant literals associated with a given OS. Follows the convention of constants /// defined in [`std::env::consts`] module. +#[const_trait] pub trait OsExt: Copy { fn exe_suffix(self) -> &'static str; fn exe_extension(self) -> &'static str; diff --git a/build/ci_utils/src/lib.rs b/build/ci_utils/src/lib.rs index 9ccce7fd492..c3dd9faa834 100644 --- a/build/ci_utils/src/lib.rs +++ b/build/ci_utils/src/lib.rs @@ -19,7 +19,7 @@ #![feature(const_deref)] #![feature(duration_constants)] #![feature(const_trait_impl)] -#![feature(is_some_with)] +#![feature(is_some_and)] #![feature(pin_macro)] #![feature(result_option_inspect)] #![feature(extend_one)] diff --git a/build/ci_utils/src/log.rs b/build/ci_utils/src/log.rs index 323f49eee75..d46cdf8d620 100644 --- a/build/ci_utils/src/log.rs +++ b/build/ci_utils/src/log.rs @@ -24,7 +24,7 @@ pub struct MyLayer; impl LookupSpan<'a>> tracing_subscriber::Layer for MyLayer { fn register_callsite(&self, metadata: &'static Metadata<'static>) -> Interest { - if metadata.module_path().is_some_and(|p| is_our_module_path(p)) { + if metadata.module_path().is_some_and(is_our_module_path) { Interest::always() } else { // dbg!(metadata); diff --git a/build/ci_utils/src/programs/cmd.rs b/build/ci_utils/src/programs/cmd.rs index 17111798f56..f039b5a6e1e 100644 --- a/build/ci_utils/src/programs/cmd.rs +++ b/build/ci_utils/src/programs/cmd.rs @@ -126,10 +126,9 @@ pub async fn compare_env( changes.extend( environment_before - .into_iter() - .map(|(variable_name, _)| Modification { variable_name, action: env::Action::Remove }), + .into_keys() + .map(|variable_name| Modification { variable_name, action: env::Action::Remove }), ); - // dbg!(&changes); Ok(changes) } diff --git a/build/intellij-run-config-gen/src/main.rs b/build/intellij-run-config-gen/src/main.rs index e1902e1567e..ba174311698 100644 --- a/build/intellij-run-config-gen/src/main.rs +++ b/build/intellij-run-config-gen/src/main.rs @@ -146,7 +146,7 @@ fn process_paths>(paths: &[T]) { for config in configs { let file_name_suffix = config.to_file_name_suffix(); let file_name = format!("{command_name}-{name}{file_name_suffix}.xml"); - let path = run_config_path.join(&file_name); + let path = run_config_path.join(file_name); let xml = generate_run_config_xml( command_name, command, @@ -154,7 +154,7 @@ fn process_paths>(paths: &[T]) { config, *cfg_type, ); - fs::write(&path, xml).expect("Unable to write the run configuration to {path:?}."); + fs::write(path, xml).expect("Unable to write the run configuration to {path:?}."); } } } diff --git a/lib/rust/callback/src/lib.rs b/lib/rust/callback/src/lib.rs index 3d8110d5966..81efd01ac9b 100644 --- a/lib/rust/callback/src/lib.rs +++ b/lib/rust/callback/src/lib.rs @@ -6,6 +6,7 @@ #![feature(fn_traits)] #![feature(unsize)] #![feature(test)] +#![feature(tuple_trait)] // === Standard Linter Configuration === #![deny(non_ascii_idents)] #![warn(unsafe_code)] @@ -127,7 +128,7 @@ impl Registry { /// Fires all registered callbacks and removes the ones which got dropped. The implementation /// is safe - you are allowed to change the registry while a callback is running. - fn run_impl(&self, args: Args) + fn run_impl(&self, args: Args) where F: FnMut { self.model.run_impl(args) } @@ -151,7 +152,7 @@ impl RegistryModel { self.callback_list.borrow().is_empty() && self.callback_list_during_run.borrow().is_empty() } - fn run_impl(&self, args: Args) + fn run_impl(&self, args: Args) where F: FnMut { if self.is_running.get() { error!("Trying to run callback manager while it's already running, ignoring."); diff --git a/lib/rust/ensogl/component/grid-view/src/header.rs b/lib/rust/ensogl/component/grid-view/src/header.rs index 6480bbd1b70..bce73b644d0 100644 --- a/lib/rust/ensogl/component/grid-view/src/header.rs +++ b/lib/rust/ensogl/component/grid-view/src/header.rs @@ -104,7 +104,7 @@ impl VisibleHeader { let next_section_y = entry::visible::position_y(self.section_rows.end, entry_size); let min_y = next_section_y + entry_size.y / 2.0 + contour.size.y / 2.0 - contour_offset.y; let x = entry::visible::position_x(col, entry_size, column_widths); - let y = (viewport.top - contour.size.y / 2.0 - contour_offset.y).min(max_y).max(min_y); + let y = (viewport.top - contour.size.y / 2.0 - contour_offset.y).clamp(min_y, max_y); entry::MovedHeaderPosition { position: Vector2(x, y), y_range: min_y..=max_y } } } diff --git a/lib/rust/ensogl/component/label/src/lib.rs b/lib/rust/ensogl/component/label/src/lib.rs index 6eff3d734ed..bd0af86bc4e 100644 --- a/lib/rust/ensogl/component/label/src/lib.rs +++ b/lib/rust/ensogl/component/label/src/lib.rs @@ -47,7 +47,7 @@ mod background { let width = width - padding.px() * 2.0; let height = height - padding.px() * 2.0; let radius = &height / 2.0; - let base_shape = Rect((&width,&height)).corners_radius(&radius); + let base_shape = Rect((&width,&height)).corners_radius(radius); let shape = base_shape.fill(Var::::from(bg_color.clone())); let alpha = Var::::from(format!("({0}.w)",bg_color)); let shadow = shadow::from_shape_with_alpha(base_shape.into(),&alpha,style); diff --git a/lib/rust/ensogl/component/list-view/src/lib.rs b/lib/rust/ensogl/component/list-view/src/lib.rs index 82d375026a9..48b092cda2e 100644 --- a/lib/rust/ensogl/component/list-view/src/lib.rs +++ b/lib/rust/ensogl/component/list-view/src/lib.rs @@ -204,7 +204,7 @@ impl Model { let logger = Logger::new("SelectionContainer"); let display_object = display::object::Instance::new(); let scrolled_area = display::object::Instance::new(); - let entries = entry::List::new(&logger, &app); + let entries = entry::List::new(logger, &app); let background = background::View::new(); let overlay = overlay::View::new(); let selection = selection::View::new(); diff --git a/lib/rust/ensogl/component/scrollbar/src/lib.rs b/lib/rust/ensogl/component/scrollbar/src/lib.rs index 5f939bcac90..9d5d7a599ea 100644 --- a/lib/rust/ensogl/component/scrollbar/src/lib.rs +++ b/lib/rust/ensogl/component/scrollbar/src/lib.rs @@ -233,7 +233,7 @@ impl Frp { // The size at which we render the thumb on screen, in normalized units. Can differ from // the actual thumb size if the thumb is smaller than the min. visual_size <- all_with(&normalized_size,&min_visual_size,|&size,&min| - size.max(min).min(1.0)); + size.clamp(min, 1.0)); // The position at which we render the thumb on screen, in normalized units. visual_start <- all_with(&normalized_position,&visual_size,|&pos,&size| pos * (1.0 - size)); diff --git a/lib/rust/ensogl/component/shadow/src/lib.rs b/lib/rust/ensogl/component/shadow/src/lib.rs index 11ab4128812..d1b5cbe85f7 100644 --- a/lib/rust/ensogl/component/shadow/src/lib.rs +++ b/lib/rust/ensogl/component/shadow/src/lib.rs @@ -50,12 +50,12 @@ pub fn parameters_from_style_path(style: &StyleWatch, path: impl Into) -> Pa let path: style::Path = path.into(); ParametersFrp { base_color: style.get_color(&path), - fading: style.get_color(&path.sub("fading")), - size: style.get_number(&path.sub("size")), - spread: style.get_number(&path.sub("spread")), - exponent: style.get_number(&path.sub("exponent")), - offset_x: style.get_number(&path.sub("offset_x")), - offset_y: style.get_number(&path.sub("offset_y")), + fading: style.get_color(path.sub("fading")), + size: style.get_number(path.sub("size")), + spread: style.get_number(path.sub("spread")), + exponent: style.get_number(path.sub("exponent")), + offset_x: style.get_number(path.sub("offset_x")), + offset_y: style.get_number(path.sub("offset_y")), } } diff --git a/lib/rust/ensogl/core/src/data/color/space/def.rs b/lib/rust/ensogl/core/src/data/color/space/def.rs index 3d9aaf772fa..fcf8f6b00cc 100644 --- a/lib/rust/ensogl/core/src/data/color/space/def.rs +++ b/lib/rust/ensogl/core/src/data/color/space/def.rs @@ -847,7 +847,7 @@ lazy_static! { /// the sRGB color space. Please read the docs of `LCH_MAX_LIGHTNESS_CHROMA_IN_SRGB_CORRELATION` to /// learn more. fn lch_lightness_to_max_chroma_in_srgb(l: f32) -> f32 { - let l = l.max(0.0).min(100.0); + let l = l.clamp(0.0, 100.0); let l_scaled = l * 100.0; let l_scaled_floor = l_scaled.floor(); let l_scaled_ceil = l_scaled.ceil(); diff --git a/lib/rust/ensogl/core/src/display/scene.rs b/lib/rust/ensogl/core/src/display/scene.rs index 09cb2ff7739..f9f4b5087b9 100644 --- a/lib/rust/ensogl/core/src/display/scene.rs +++ b/lib/rust/ensogl/core/src/display/scene.rs @@ -922,8 +922,8 @@ impl SceneData { let width = canvas.width.round() as i32; let height = canvas.height.round() as i32; debug_span!("Resized to {screen.width}px x {screen.height}px.").in_scope(|| { - self.dom.layers.canvas.set_attribute_or_warn("width", &width.to_string()); - self.dom.layers.canvas.set_attribute_or_warn("height", &height.to_string()); + self.dom.layers.canvas.set_attribute_or_warn("width", width.to_string()); + self.dom.layers.canvas.set_attribute_or_warn("height", height.to_string()); if let Some(context) = &*self.context.borrow() { context.viewport(0, 0, width, height); } diff --git a/lib/rust/ensogl/core/src/display/style/sheet.rs b/lib/rust/ensogl/core/src/display/style/sheet.rs index 8b42dac0489..fca7e1e5b66 100644 --- a/lib/rust/ensogl/core/src/display/style/sheet.rs +++ b/lib/rust/ensogl/core/src/display/style/sheet.rs @@ -152,7 +152,7 @@ impl Expression { /// Simple reference (identity) expression constructor. pub fn reference(path: impl Into) -> Self { - Self::new(&[path.into()], |t| t[0].clone()) + Self::new([path.into()], |t| t[0].clone()) } } diff --git a/lib/rust/ensogl/core/src/display/style/theme.rs b/lib/rust/ensogl/core/src/display/style/theme.rs index f5a15c474dd..4f75ec60bcd 100644 --- a/lib/rust/ensogl/core/src/display/style/theme.rs +++ b/lib/rust/ensogl/core/src/display/style/theme.rs @@ -269,7 +269,7 @@ impl Manager { let name = name.into(); let theme = self.data.borrow().combined.deep_clone(); self.register_internal(name.clone(), theme); - self.set_enabled(&[name]); + self.set_enabled([name]); } fn register_internal(&self, name: String, theme: Theme) { @@ -359,6 +359,6 @@ pub fn test() { theme_manager.register("theme1", theme1); theme_manager.register("theme2", theme2); - theme_manager.set_enabled(&["theme1".to_string()]); + theme_manager.set_enabled(["theme1".to_string()]); theme_manager.set_enabled(["theme1", "theme2"]); } diff --git a/lib/rust/ensogl/core/src/display/symbol/gpu/geometry/compound/sprite.rs b/lib/rust/ensogl/core/src/display/symbol/gpu/geometry/compound/sprite.rs index 4dca4a05925..1b6c49fb548 100644 --- a/lib/rust/ensogl/core/src/display/symbol/gpu/geometry/compound/sprite.rs +++ b/lib/rust/ensogl/core/src/display/symbol/gpu/geometry/compound/sprite.rs @@ -374,8 +374,8 @@ impl SpriteSystem { let shader = self.symbol.shader(); let surface_material = Self::default_surface_material(); let geometry_material = Self::default_geometry_material(); - shader.set_geometry_material(&geometry_material); - shader.set_material(&surface_material); + shader.set_geometry_material(geometry_material); + shader.set_material(surface_material); } /// The default geometry material for all sprites. diff --git a/lib/rust/ensogl/core/src/display/world.rs b/lib/rust/ensogl/core/src/display/world.rs index f7a34945cb0..797b0028856 100644 --- a/lib/rust/ensogl/core/src/display/world.rs +++ b/lib/rust/ensogl/core/src/display/world.rs @@ -333,7 +333,7 @@ impl WorldData { let logger = Logger::new("renderer"); let pipeline = render::Pipeline::new() .add(SymbolsRenderPass::new( - &logger, + logger, self.default_scene.symbols(), &self.default_scene.layers, )) diff --git a/lib/rust/ensogl/example/complex-shape-system/src/lib.rs b/lib/rust/ensogl/example/complex-shape-system/src/lib.rs index a0d616b4ded..c8210df9890 100644 --- a/lib/rust/ensogl/example/complex-shape-system/src/lib.rs +++ b/lib/rust/ensogl/example/complex-shape-system/src/lib.rs @@ -83,7 +83,7 @@ pub fn main() { theme_manager.register("theme1", theme1); theme_manager.register("theme2", theme2); - theme_manager.set_enabled(&["theme1".to_string()]); + theme_manager.set_enabled(["theme1".to_string()]); let style_watch = ensogl_core::display::shape::StyleWatch::new(&scene.style_sheet); // style_watch.set_on_style_change(|| DEBUG!("Style changed!")); @@ -161,7 +161,7 @@ pub fn main() { } if frame == 200 { DEBUG!("Changing the theme."); - theme_manager.set_enabled(&["theme2".to_string()]); + theme_manager.set_enabled(["theme2".to_string()]); } frame += 1; }) diff --git a/lib/rust/ensogl/example/profiling-run-graph/src/lib.rs b/lib/rust/ensogl/example/profiling-run-graph/src/lib.rs index a34f5a401da..144cd6a0892 100644 --- a/lib/rust/ensogl/example/profiling-run-graph/src/lib.rs +++ b/lib/rust/ensogl/example/profiling-run-graph/src/lib.rs @@ -129,7 +129,7 @@ fn init_theme(scene: &Scene) { theme.set("component.label.text", color::Lcha::black()); theme_manager.register("theme", theme); - theme_manager.set_enabled(&["theme".to_string()]); + theme_manager.set_enabled(["theme".to_string()]); } diff --git a/lib/rust/ensogl/example/render-profile-flamegraph/src/lib.rs b/lib/rust/ensogl/example/render-profile-flamegraph/src/lib.rs index 604853517be..862eed2e616 100644 --- a/lib/rust/ensogl/example/render-profile-flamegraph/src/lib.rs +++ b/lib/rust/ensogl/example/render-profile-flamegraph/src/lib.rs @@ -111,7 +111,7 @@ fn init_theme(scene: &display::Scene) { theme.set(COLOR_PATH, color::Rgb::new(1.0, 45.0 / 255.0, 0.0)); theme.set("component.label.text", color::Lcha::black()); theme_manager.register("theme", theme); - theme_manager.set_enabled(&["theme".to_string()]); + theme_manager.set_enabled(["theme".to_string()]); let style_watch = ensogl_core::display::shape::StyleWatch::new(&scene.style_sheet); style_watch.get(COLOR_PATH); } diff --git a/lib/rust/ensogl/example/text-area/src/lib.rs b/lib/rust/ensogl/example/text-area/src/lib.rs index 28d8deb9363..f99e931ba21 100644 --- a/lib/rust/ensogl/example/text-area/src/lib.rs +++ b/lib/rust/ensogl/example/text-area/src/lib.rs @@ -212,8 +212,8 @@ fn init(app: Application) { let scene = scene.clone_ref(); let handler = app.display.on.before_frame.add(move |_time| { let shape = scene.dom.shape(); - div.set_style_or_warn("left", &format!("{}px", shape.width / 2.0)); - div.set_style_or_warn("top", &format!("{}px", shape.height / 2.0 - 0.5)); + div.set_style_or_warn("left", format!("{}px", shape.width / 2.0)); + div.set_style_or_warn("top", format!("{}px", shape.height / 2.0 - 0.5)); }); mem::forget(handler); diff --git a/lib/rust/metamodel/src/lib.rs b/lib/rust/metamodel/src/lib.rs index ca546e7cd00..4992f7d798b 100644 --- a/lib/rust/metamodel/src/lib.rs +++ b/lib/rust/metamodel/src/lib.rs @@ -44,7 +44,6 @@ //! Java code after all computation is completed. // === Features === -#![feature(map_first_last)] #![feature(option_get_or_insert_default)] // === Standard Linter Configuration === #![deny(non_ascii_idents)] diff --git a/lib/rust/parser/generate-java/src/main.rs b/lib/rust/parser/generate-java/src/main.rs index 3c4cc23162e..7c1fa055d2d 100644 --- a/lib/rust/parser/generate-java/src/main.rs +++ b/lib/rust/parser/generate-java/src/main.rs @@ -52,6 +52,6 @@ fn main() { let dir = args.next().expect("Usage: generate-java "); for class in graph { let code = class.to_string(); - std::fs::write(format!("{}/{}.java", &dir, &class.name), &code).unwrap(); + std::fs::write(format!("{}/{}.java", &dir, &class.name), code).unwrap(); } } diff --git a/lib/rust/parser/jni/src/lib.rs b/lib/rust/parser/jni/src/lib.rs index f0cd89954f0..4ea8cba67b2 100644 --- a/lib/rust/parser/jni/src/lib.rs +++ b/lib/rust/parser/jni/src/lib.rs @@ -121,7 +121,7 @@ pub extern "system" fn Java_org_enso_syntax2_Parser_getMetadata( /// Allocate a new parser state object. The returned value should be passed to `freeState` when no /// longer needed. -#[allow(unsafe_code)] +#[allow(unsafe_code, clippy::box_default)] #[no_mangle] pub extern "system" fn Java_org_enso_syntax2_Parser_allocState( _env: JNIEnv, diff --git a/lib/rust/reflect/src/lib.rs b/lib/rust/reflect/src/lib.rs index d916f866a20..b9799f9e4a8 100644 --- a/lib/rust/reflect/src/lib.rs +++ b/lib/rust/reflect/src/lib.rs @@ -107,7 +107,6 @@ //! it, and probably never will.) // === Features === -#![feature(map_first_last)] #![feature(associated_type_defaults)] #![feature(option_get_or_insert_default)] // === Standard Linter Configuration === diff --git a/lib/rust/types/src/algebra.rs b/lib/rust/types/src/algebra.rs index 8875dad4bf5..b8bcb22efa9 100644 --- a/lib/rust/types/src/algebra.rs +++ b/lib/rust/types/src/algebra.rs @@ -479,6 +479,7 @@ impl Acos for f32 { /// Saturating addition. Computes self + rhs, saturating at the numeric bounds instead of /// overflowing. +#[const_trait] #[allow(missing_docs)] pub trait SaturatingAdd { type Output; @@ -488,6 +489,7 @@ pub trait SaturatingAdd { /// Saturating subtraction. Computes self - rhs, saturating at the numeric bounds instead of /// overflowing. #[allow(missing_docs)] +#[const_trait] pub trait SaturatingSub { type Output; fn saturating_sub(self, rhs: Rhs) -> Self::Output; @@ -496,6 +498,7 @@ pub trait SaturatingSub { /// Saturating multiplication. Computes self * rhs, saturating at the numeric bounds instead of /// overflowing. #[allow(missing_docs)] +#[const_trait] pub trait SaturatingMul { type Output; fn saturating_mul(self, rhs: Rhs) -> Self::Output; @@ -503,6 +506,7 @@ pub trait SaturatingMul { /// Saturating power. Computes self ^ exp, saturating at the numeric bounds instead of overflowing. #[allow(missing_docs)] +#[const_trait] pub trait SaturatingPow { type Output; fn saturating_pow(self, exp: u32) -> Self::Output; diff --git a/lib/rust/types/src/unit2.rs b/lib/rust/types/src/unit2.rs index 88b4bbacc78..40d84f8d15e 100644 --- a/lib/rust/types/src/unit2.rs +++ b/lib/rust/types/src/unit2.rs @@ -39,6 +39,7 @@ mod ops { /// Unchecked unit conversion. You should use it only for unit conversion definition, never in /// unit-usage code. #[allow(missing_docs)] +#[const_trait] pub trait UncheckedFrom { fn unchecked_from(t: T) -> Self; } @@ -58,6 +59,7 @@ impl const UncheckedFrom for UnitData { /// Unchecked unit conversion. See [`UncheckedFrom`] to learn more. #[allow(missing_docs)] +#[const_trait] pub trait UncheckedInto { fn unchecked_into(self) -> T; } @@ -326,11 +328,13 @@ impl IntoUncheckedRawRange for ops::RangeFrom> { macro_rules! gen_ops { ($rev_trait:ident, $trait:ident, $op:ident) => { #[allow(missing_docs)] + #[const_trait] pub trait $trait { type Output; } #[allow(missing_docs)] + #[const_trait] pub trait $rev_trait { type Output; } @@ -693,6 +697,7 @@ define_ops![ /// Methods of the [`Duration`] unit. #[allow(missing_docs)] +#[const_trait] pub trait DurationOps { fn ms(t: f32) -> Duration; fn s(t: f32) -> Duration; @@ -734,6 +739,7 @@ impl const DurationOps for Duration { /// Methods of the [`Duration`] unit as extensions for numeric types. #[allow(missing_docs)] +#[const_trait] pub trait DurationNumberOps { fn ms(self) -> Duration; fn s(self) -> Duration; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index bfe298d5853..d360e8aaf00 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2022-09-21" +channel = "nightly-2022-11-22" components = ["clippy", "rustfmt"] profile = "default" targets = ["wasm32-unknown-unknown"]