From 8021109d8c2ae7106f9545a38b77833211bd98ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Wawrzyniec=20Urba=C5=84czyk?= Date: Thu, 23 Nov 2023 21:19:31 +0100 Subject: [PATCH] Build script fixes & improvements (#8285) --- .github/workflows/gui.yml | 3 - .github/workflows/scala-new.yml | 3 - Cargo.lock | 739 +++--------------- Cargo.toml | 9 +- app/gui/Cargo.toml | 2 +- .../double-representation/Cargo.toml | 2 +- app/gui/controller/engine-protocol/Cargo.toml | 2 +- app/gui/enso-profiler-enso-data/Cargo.toml | 2 +- app/gui/language/ast/impl/Cargo.toml | 2 +- app/gui/language/parser/Cargo.toml | 2 +- app/gui/suggestion-database/Cargo.toml | 2 +- app/gui/view/Cargo.toml | 2 +- app/gui/view/graph-editor/Cargo.toml | 2 +- build/build/Cargo.toml | 40 +- build/build/src/ci_gen/job.rs | 15 +- build/build/src/engine/sbt.rs | 2 + build/ci-gen/src/main.rs | 5 +- build/ci_utils/Cargo.toml | 28 +- .../src/actions/workflow/definition.rs | 2 +- build/ci_utils/src/env.rs | 14 +- build/ci_utils/src/env/accessor.rs | 8 +- build/ci_utils/src/env/known.rs | 15 + build/cli/Cargo.toml | 9 +- lib/rust/config-reader/Cargo.toml | 2 +- lib/rust/data-structures/Cargo.toml | 2 +- lib/rust/ensogl/component/text/Cargo.toml | 2 +- .../component/text/src/font/msdf/Cargo.toml | 2 +- lib/rust/ensogl/core/Cargo.toml | 2 +- lib/rust/ensogl/pack/Cargo.toml | 6 +- lib/rust/generics/Cargo.toml | 2 +- lib/rust/json-rpc/Cargo.toml | 2 +- lib/rust/json-to-struct/Cargo.toml | 2 +- lib/rust/metamodel/lexpr/Cargo.toml | 2 +- lib/rust/parser/Cargo.toml | 2 +- lib/rust/parser/debug/Cargo.toml | 2 +- lib/rust/parser/doc-parser/Cargo.toml | 2 +- lib/rust/parser/schema/Cargo.toml | 2 +- lib/rust/prelude/Cargo.toml | 2 +- lib/rust/profiler/Cargo.toml | 2 +- lib/rust/profiler/data/Cargo.toml | 2 +- lib/rust/shapely/Cargo.toml | 3 - lib/rust/shapely/macros/Cargo.toml | 3 - lib/rust/shortcuts/Cargo.toml | 2 +- lib/rust/shortcuts/example/Cargo.toml | 2 +- lib/rust/text/Cargo.toml | 2 +- lib/rust/types/Cargo.toml | 2 +- lib/rust/zst/Cargo.toml | 2 +- run | 10 +- run.cmd | 4 +- run.ps1 | 19 +- 50 files changed, 193 insertions(+), 804 deletions(-) diff --git a/.github/workflows/gui.yml b/.github/workflows/gui.yml index 90310eeefb..6f5cbd4c2f 100644 --- a/.github/workflows/gui.yml +++ b/.github/workflows/gui.yml @@ -56,7 +56,6 @@ jobs: - run: ./run backend get env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - LC_ALL: C.UTF-8 - if: failure() && runner.os == 'Windows' name: List files if failed (Windows) run: Get-ChildItem -Force -Recurse @@ -113,7 +112,6 @@ jobs: - run: ./run backend get env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - LC_ALL: C.UTF-8 - if: failure() && runner.os == 'Windows' name: List files if failed (Windows) run: Get-ChildItem -Force -Recurse @@ -172,7 +170,6 @@ jobs: - run: ./run backend get env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - LC_ALL: C.UTF-8 - if: failure() && runner.os == 'Windows' name: List files if failed (Windows) run: Get-ChildItem -Force -Recurse diff --git a/.github/workflows/scala-new.yml b/.github/workflows/scala-new.yml index 2a27777d58..83f913f4d0 100644 --- a/.github/workflows/scala-new.yml +++ b/.github/workflows/scala-new.yml @@ -70,7 +70,6 @@ jobs: AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }} AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - LC_ALL: C.UTF-8 - if: success() || failure() name: Engine Test Reporter uses: dorny/test-reporter@v1 @@ -150,7 +149,6 @@ jobs: AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }} AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - LC_ALL: C.UTF-8 - if: success() || failure() name: Engine Test Reporter uses: dorny/test-reporter@v1 @@ -232,7 +230,6 @@ jobs: AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }} AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - LC_ALL: C.UTF-8 - if: success() || failure() name: Engine Test Reporter uses: dorny/test-reporter@v1 diff --git a/Cargo.lock b/Cargo.lock index 17f1d95894..7f4e2db765 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,12 +47,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - [[package]] name = "analytics" version = "0.1.0" @@ -100,12 +94,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - [[package]] name = "assert-json-diff" version = "2.0.2" @@ -221,7 +209,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -260,27 +248,6 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "async-stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "async-task" version = "4.3.0" @@ -298,12 +265,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "async_once" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ce4f10ea3abcd6617873bae9f91d1c5332b4a778bd9ce34d0cd517474c1de82" - [[package]] name = "atomic-waker" version = "1.1.0" @@ -675,52 +636,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "axum" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa 1.0.5", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-http", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - [[package]] name = "backtrace" version = "0.3.67" @@ -953,43 +868,6 @@ dependencies = [ "either", ] -[[package]] -name = "cached" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e27085975166ffaacbd04527132e1cf5906fa612991f9b4fea08e787da2961" -dependencies = [ - "async-trait", - "async_once", - "cached_proc_macro", - "cached_proc_macro_types", - "futures", - "hashbrown", - "instant", - "lazy_static", - "once_cell", - "thiserror", - "tokio", -] - -[[package]] -name = "cached_proc_macro" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751f7f4e7a091545e7f6c65bacc404eaee7e87bfb1f9ece234a1caa173dc16f2" -dependencies = [ - "cached_proc_macro_types", - "darling", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "cached_proc_macro_types" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" - [[package]] name = "cast" version = "0.3.0" @@ -1104,19 +982,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "combine" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" -dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", -] - [[package]] name = "combine" version = "4.6.6" @@ -1155,43 +1020,7 @@ dependencies = [ "lazy_static", "libc", "unicode-width", - "windows-sys", -] - -[[package]] -name = "console-api" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57ff02e8ad8e06ab9731d5dc72dc23bef9200778eae1a89d555d8c42e5d4a86" -dependencies = [ - "prost", - "prost-types", - "tonic", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a3a81dfaf6b66bce5d159eddae701e3a002f194d378cbf7be5f053c281d9be" -dependencies = [ - "console-api", - "crossbeam-channel", - "crossbeam-utils", - "futures", - "hdrhistogram", - "humantime 2.1.0", - "prost-types", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic", - "tracing", - "tracing-core", - "tracing-subscriber", + "windows-sys 0.42.0", ] [[package]] @@ -1317,17 +1146,6 @@ dependencies = [ "itertools", ] -[[package]] -name = "cron" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" -dependencies = [ - "chrono", - "nom", - "once_cell", -] - [[package]] name = "crossbeam-channel" version = "0.5.6" @@ -1466,41 +1284,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.107", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.107", -] - [[package]] name = "data-encoding" version = "2.3.3" @@ -1750,22 +1533,23 @@ dependencies = [ [[package]] name = "dirs" -version = "4.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1871,19 +1655,14 @@ name = "enso-build" version = "0.1.0" dependencies = [ "anyhow", - "async-compression", - "async-trait", "aws-config", "aws-sdk-ecr", "aws-sdk-s3", "base64 0.13.1", "byte-unit", "bytes", - "cached", - "cfg-if 1.0.0", "chrono", "clap 3.2.23", - "console-subscriber", "derivative", "derive_more", "dirs", @@ -1892,35 +1671,17 @@ dependencies = [ "enso-enso-font", "enso-font", "ensogl-pack", - "filetime", - "flate2", - "flume", - "fs_extra", "futures", "futures-util", "glob", "handlebars", - "heck", - "humantime 2.1.0", "ide-ci", - "indexmap", - "indicatif", - "itertools", - "lazy_static", "mime", "new_mime_guess", - "nix", "octocrab", - "ouroboros", - "paste", - "path-absolutize", "path-slash", - "pin-project", - "platforms", "port_check", - "pretty_env_logger", "pulldown-cmark", - "rand 0.8.5", "regex", "reqwest", "scopeguard", @@ -1930,18 +1691,13 @@ dependencies = [ "serde_yaml", "strum", "sysinfo", - "tar", "tempfile", "tokio", "toml", "tracing", - "tracing-subscriber", - "unicase", "url", "uuid 1.2.2", "walkdir", - "which", - "whoami", "zip", ] @@ -1976,28 +1732,20 @@ version = "0.1.0" dependencies = [ "anyhow", "byte-unit", - "chrono", "clap 3.2.23", "derivative", "enso-build", "enso-build-base", "enso-formatter", - "ensogl-pack", - "futures", "futures-util", "glob", - "humantime 2.1.0", + "humantime", "ide-ci", "octocrab", - "serde", - "serde_json", - "serde_yaml", - "strum", "tempfile", "tokio", "toml", "tracing", - "tracing-subscriber", ] [[package]] @@ -2539,12 +2287,9 @@ dependencies = [ name = "enso-shapely" version = "0.2.0" dependencies = [ - "derivative", "enso-prelude", "enso-shapely-macros", "enso-zst", - "paste", - "rustversion", "wasm-bindgen", "wasm-bindgen-test", "web-sys", @@ -2562,7 +2307,6 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.107", - "wasm-bindgen-test", ] [[package]] @@ -3231,16 +2975,12 @@ dependencies = [ name = "ensogl-pack" version = "0.1.0" dependencies = [ - "enso-bitmap", "enso-prelude", - "fs_extra", "futures", "ide-ci", "manifest-dir-macros", - "regex", "serde", "serde_json", - "tempfile", "tokio", "walkdir", ] @@ -3421,19 +3161,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "atty", - "humantime 1.3.0", - "log", - "regex", - "termcolor", -] - [[package]] name = "errno" version = "0.2.8" @@ -3501,7 +3228,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3854,64 +3581,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "graphql-introspection-query" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2a4732cf5140bd6c082434494f785a19cfb566ab07d1382c3671f5812fed6d" -dependencies = [ - "serde", -] - -[[package]] -name = "graphql-parser" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" -dependencies = [ - "combine 3.8.1", - "thiserror", -] - -[[package]] -name = "graphql_client" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc16d75d169fddb720d8f1c7aed6413e329e1584079b9734ff07266a193f5bc" -dependencies = [ - "graphql_query_derive", - "serde", - "serde_json", -] - -[[package]] -name = "graphql_client_codegen" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f290ecfa3bea3e8a157899dc8a1d96ee7dd6405c18c8ddd213fc58939d18a0e9" -dependencies = [ - "graphql-introspection-query", - "graphql-parser", - "heck", - "lazy_static", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 1.0.107", -] - -[[package]] -name = "graphql_query_derive" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a755cc59cda2641ea3037b4f9f7ef40471c329f55c1fa2db6fa0bb7ae6c1f7ce" -dependencies = [ - "graphql_client_codegen", - "proc-macro2", - "syn 1.0.107", -] - [[package]] name = "h2" version = "0.3.15" @@ -3960,19 +3629,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "hdrhistogram" -version = "7.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" -dependencies = [ - "base64 0.13.1", - "byteorder", - "flate2", - "nom", - "num-traits", -] - [[package]] name = "headers" version = "0.3.8" @@ -4070,12 +3726,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" - [[package]] name = "http-serde" version = "1.1.2" @@ -4119,15 +3769,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - [[package]] name = "humantime" version = "2.1.0" @@ -4188,18 +3829,6 @@ dependencies = [ "tokio-rustls 0.23.4", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "hyperx" version = "1.4.0" @@ -4250,12 +3879,8 @@ dependencies = [ "bincode 1.3.3", "byte-unit", "bytes", - "cached", - "cfg-if 1.0.0", "chrono", "clap 3.2.23", - "convert_case 0.6.0", - "cron", "data-encoding", "dependency_runner", "derivative", @@ -4263,18 +3888,15 @@ dependencies = [ "dirs", "enso-build-base", "enso-zst", - "filetime", "flate2", "flume", "fs_extra", "futures", "futures-util", "glob", - "graphql_client", "headers", "heck", "http-serde", - "indexmap", "indicatif", "itertools", "lazy_static", @@ -4282,22 +3904,15 @@ dependencies = [ "mime", "multimap", "new_mime_guess", - "nix", "octocrab", "paste", "path-absolutize", "path-slash", "pathdiff", - "pin-project", "platforms", - "port_check", - "pretty_env_logger", - "proc-macro2", - "quote", "rand 0.8.5", "regex", "reqwest", - "scopeguard", "semver 1.0.16", "serde", "serde_json", @@ -4305,7 +3920,6 @@ dependencies = [ "sha2", "strum", "symlink", - "syn 2.0.15", "sysinfo", "tar", "tempfile", @@ -4320,7 +3934,6 @@ dependencies = [ "walkdir", "warp", "which", - "whoami", "wiremock", "zip", ] @@ -4511,12 +4124,6 @@ dependencies = [ "uuid 0.8.2", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.2.3" @@ -4587,7 +4194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -4624,7 +4231,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" dependencies = [ "cesu8", - "combine 4.6.6", + "combine", "jni-sys", "log", "thiserror", @@ -4830,12 +4437,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" -[[package]] -name = "matchit" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" - [[package]] name = "matrixmultiply" version = "0.3.2" @@ -4891,12 +4492,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.6.2" @@ -4915,7 +4510,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5040,36 +4635,12 @@ dependencies = [ "unicase", ] -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if 1.0.0", - "libc", - "memoffset", - "pin-utils", - "static_assertions", -] - [[package]] name = "no-std-compat" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "nom8" version = "0.2.0" @@ -5288,6 +4859,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "ordered-float" version = "3.4.0" @@ -5303,29 +4880,6 @@ version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" -[[package]] -name = "ouroboros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" -dependencies = [ - "aliasable", - "ouroboros_macro", -] - -[[package]] -name = "ouroboros_macro" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "overload" version = "0.1.1" @@ -5367,7 +4921,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec 1.10.0", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5539,9 +5093,9 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "platforms" -version = "3.0.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" dependencies = [ "serde", ] @@ -5585,7 +5139,7 @@ dependencies = [ "libc", "log", "wepoll-ffi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5645,16 +5199,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "pretty_env_logger" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" -dependencies = [ - "env_logger", - "log", -] - [[package]] name = "proc-macro-crate" version = "1.3.0" @@ -5704,39 +5248,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "prost-types" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" -dependencies = [ - "bytes", - "prost", -] - [[package]] name = "pulldown-cmark" version = "0.9.2" @@ -6060,7 +5571,7 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -6167,7 +5678,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -6572,12 +6083,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.10.0" @@ -6640,12 +6145,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" - [[package]] name = "synstructure" version = "0.12.6" @@ -6660,9 +6159,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.26.9" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c18a6156d1f27a9592ee18c1a846ca8dd5c258b7179fc193ae87c74ebb666f5" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -6714,7 +6213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" dependencies = [ "rustix", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -6851,17 +6350,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", + "windows-sys 0.42.0", ] [[package]] @@ -6974,38 +6463,6 @@ dependencies = [ "toml_datetime", ] -[[package]] -name = "tonic" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.13.1", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "prost-derive", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - [[package]] name = "tower" version = "0.4.13" @@ -7014,37 +6471,14 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", "pin-project", "pin-project-lite", - "rand 0.8.5", - "slab", "tokio", - "tokio-util", "tower-layer", "tower-service", "tracing", ] -[[package]] -name = "tower-http" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.2" @@ -7091,16 +6525,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.1.3" @@ -7260,15 +6684,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - [[package]] name = "unsafe-libyaml" version = "0.2.5" @@ -7365,12 +6780,6 @@ version = "0.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b60dcd6a64dd45abf9bd426970c9843726da7fc08f44cd6fcebf68c21220a63" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "waker-fn" version = "1.1.0" @@ -7658,16 +7067,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "whoami" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - [[package]] name = "winapi" version = "0.3.9" @@ -7705,13 +7104,37 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -7720,42 +7143,84 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + [[package]] name = "windows_i686_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + [[package]] name = "windows_i686_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + [[package]] name = "windows_x86_64_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + [[package]] name = "windows_x86_64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "winreg" version = "0.10.1" diff --git a/Cargo.toml b/Cargo.toml index dcabf13461..64d1807cb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,13 +85,17 @@ debug-assertions = true # We are tryingto maintain minimum set of dependencies. Before adding a new dependency, consult it # with the core development team. Thank you! console-subscriber = "0.1.8" -nix = "0.26.1" +dirs = { version = "5.0.1" } +nix = { version = "0.27.1" } octocrab = { git = "https://github.com/enso-org/octocrab", default-features = false, features = [ "rustls", ] } +platforms = { version = "3.2.0", features = ["serde"] } regex = { version = "1.6.0" } +serde = { version = "1.0.130", features = ["derive", "rc"] } serde_yaml = { version = "0.9.16" } serde-wasm-bindgen = { version = "0.4.5" } +sysinfo = { version = "0.29.10" } tokio = { version = "1.23.0", features = ["full", "tracing"] } tokio-stream = { version = "0.1.12", features = ["fs"] } tokio-util = { version = "0.7.4", features = ["full"] } @@ -126,7 +130,8 @@ bytes = { version = "1.1.0" } matches = { version = "0.1" } console_error_panic_hook = { version = "0.1.6" } reqwest = { version = "0.11.5", default-features = false, features = [ - "rustls-tls" + "rustls-tls", + "stream" ] } proc-macro2 = { version = "1.0.50" } syn = { version = "2.0", features = [ diff --git a/app/gui/Cargo.toml b/app/gui/Cargo.toml index c5a1e8307c..f4a0048dea 100644 --- a/app/gui/Cargo.toml +++ b/app/gui/Cargo.toml @@ -53,7 +53,7 @@ js-sys = { workspace = true } mockall = { version = "0.7.1", features = ["nightly"] } nalgebra = { workspace = true } semver = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } serde_json = { workspace = true } sha3 = { version = "0.8.2" } superslice = { workspace = true } diff --git a/app/gui/controller/double-representation/Cargo.toml b/app/gui/controller/double-representation/Cargo.toml index e54379a778..3f7d9b3c86 100644 --- a/app/gui/controller/double-representation/Cargo.toml +++ b/app/gui/controller/double-representation/Cargo.toml @@ -18,7 +18,7 @@ enso-text = { path = "../../../../lib/rust/text" } const_format = { workspace = true } failure = { workspace = true } itertools = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } uuid = { version = "0.8", features = ["serde", "v4", "wasm-bindgen"] } [dev-dependencies] diff --git a/app/gui/controller/engine-protocol/Cargo.toml b/app/gui/controller/engine-protocol/Cargo.toml index fc86a57bdd..c2ec00476e 100644 --- a/app/gui/controller/engine-protocol/Cargo.toml +++ b/app/gui/controller/engine-protocol/Cargo.toml @@ -19,7 +19,7 @@ futures = { workspace = true } hex = { version = "0.4.2" } json-rpc = { path = "../../../../lib/rust/json-rpc" } mockall = { version = "0.7.1", features = ["nightly"] } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } serde_json = { workspace = true } sha3 = { version = "0.8.2" } strum = { workspace = true } diff --git a/app/gui/enso-profiler-enso-data/Cargo.toml b/app/gui/enso-profiler-enso-data/Cargo.toml index e072ab0dac..c829962f88 100644 --- a/app/gui/enso-profiler-enso-data/Cargo.toml +++ b/app/gui/enso-profiler-enso-data/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Enso Team "] [dependencies] chrono = { version = "0.4.19", features = ["serde"] } csv = "1.1" -serde = { version = "1", features = ["derive"] } +serde = { workspace = true } enso-profiler = { path = "../../../lib/rust/profiler" } enso-profiler-data = { path = "../../../lib/rust/profiler/data" } ensogl-core = { path = "../../../lib/rust/ensogl/core" } diff --git a/app/gui/language/ast/impl/Cargo.toml b/app/gui/language/ast/impl/Cargo.toml index c32a7705ae..160b0e3862 100644 --- a/app/gui/language/ast/impl/Cargo.toml +++ b/app/gui/language/ast/impl/Cargo.toml @@ -12,7 +12,7 @@ derive_more = { workspace = true } failure = { workspace = true } lazy_static = { workspace = true } regex = { workspace = true } -serde = { version = "1.0", features = ["derive", "rc"] } +serde = { workspace = true } uuid = { version = "0.8.1", features = ["serde", "v4", "wasm-bindgen"] } ast-macros = { path = "../macros" } enso-data-structures = { path = "../../../../../lib/rust/data-structures" } diff --git a/app/gui/language/parser/Cargo.toml b/app/gui/language/parser/Cargo.toml index 166d1fffa8..5a7e57c0b0 100644 --- a/app/gui/language/parser/Cargo.toml +++ b/app/gui/language/parser/Cargo.toml @@ -12,7 +12,7 @@ ast = { path = "../ast/impl" } enso-parser = { path = "../../../../lib/rust/parser" } enso-prelude = { path = "../../../../lib/rust/prelude" } enso-profiler = { path = "../../../../lib/rust/profiler" } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } serde_json = { version = "1.0", features = ["unbounded_depth"] } enso-text = { path = "../../../../lib/rust/text" } failure = { version = "0.1" } diff --git a/app/gui/suggestion-database/Cargo.toml b/app/gui/suggestion-database/Cargo.toml index 620e44ecb9..51963cd1f2 100644 --- a/app/gui/suggestion-database/Cargo.toml +++ b/app/gui/suggestion-database/Cargo.toml @@ -23,7 +23,7 @@ ensogl-icons = { path = "../../../lib/rust/ensogl/component/icons" } flo_stream = { version = "0.4.0" } failure = { workspace = true } enso-notification = { path = "../../../lib/rust/notification" } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } serde_json = "1.0" [dev-dependencies] diff --git a/app/gui/view/Cargo.toml b/app/gui/view/Cargo.toml index 6b0a443da0..774bd1e7bb 100644 --- a/app/gui/view/Cargo.toml +++ b/app/gui/view/Cargo.toml @@ -33,7 +33,7 @@ multi-map = { workspace = true } nalgebra = { workspace = true } ordered-float = { workspace = true } serde_json = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } strum = { workspace = true } uuid = { version = "0.8", features = ["serde", "v4", "wasm-bindgen"] } wasm-bindgen = { workspace = true } diff --git a/app/gui/view/graph-editor/Cargo.toml b/app/gui/view/graph-editor/Cargo.toml index 9277ca1426..d84d058947 100644 --- a/app/gui/view/graph-editor/Cargo.toml +++ b/app/gui/view/graph-editor/Cargo.toml @@ -33,7 +33,7 @@ js-sys = { workspace = true } nalgebra = { workspace = true } ordered-float = { workspace = true } parser = { path = "../../language/parser" } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } serde-wasm-bindgen = { workspace = true } serde_json = { workspace = true } sourcemap = "6.0" diff --git a/build/build/Cargo.toml b/build/build/Cargo.toml index 146c5f55e7..0ebb33b59c 100644 --- a/build/build/Cargo.toml +++ b/build/build/Cargo.toml @@ -6,80 +6,48 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] anyhow = { workspace = true } -async-compression = "0.3.12" -async-trait = "0.1.51" aws-config = "0.49.0" aws-sdk-ecr = "0.19.0" aws-sdk-s3 = "0.19.0" base64 = "0.13.0" bytes = { workspace = true } byte-unit = { workspace = true } -cached = "0.39.0" -cfg-if = "1.0.0" chrono = { version = "0.4.19", features = ["serde"] } clap = { version = "3.1.5", features = ["derive", "env", "wrap_help"] } derivative = { workspace = true } derive_more = { workspace = true } -dirs = "4.0.0" -filetime = "0.2.15" -flate2 = "1.0.22" -flume = "0.10.10" -fs_extra = "1.2.0" +dirs = { workspace = true } futures = { workspace = true } futures-util = "0.3.17" glob = "0.3.0" -#graphql_client = "0.10.0" handlebars = "4.3.5" -heck = "0.4.0" -humantime = "2.1.0" enso-build-base = { path = "../base" } enso-enso-font = { path = "../../lib/rust/enso-font" } enso-font = { path = "../../lib/rust/font" } ensogl-pack = { path = "../../lib/rust/ensogl/pack" } ide-ci = { path = "../ci_utils" } -indexmap = "1.7.0" -indicatif = "0.17.1" -itertools = { workspace = true } -lazy_static = { workspace = true } -#git2 = "0.13.25" mime = "0.3.16" new_mime_guess = "4.0.1" -nix = { workspace = true } octocrab = { workspace = true } -ouroboros = "0.15.0" -paste = { workspace = true } -path-absolutize = "3.0.11" path-slash = "0.2.1" -platforms = { version = "3.0.0", features = ["serde"] } -pin-project = "1.0.8" port_check = "0.1.5" -pretty_env_logger = "0.4.0" pulldown-cmark = "0.9.1" -rand = "0.8.4" regex = { workspace = true } -reqwest = { version = "0.11.5", default-features = false, features = [ - "stream" -] } +reqwest = { workspace = true } semver = { workspace = true } -serde = { version = "1.0.130", features = ["derive"] } +serde = { workspace = true } serde_json = { workspace = true } serde_yaml = { workspace = true } scopeguard = "1.1.0" strum = { workspace = true } -sysinfo = "0.26.2" -tar = "0.4.37" +sysinfo = { workspace = true } tempfile = "3.2.0" toml = "0.5.8" tokio = { workspace = true } tracing = { version = "0.1.37" } -tracing-subscriber = "0.3.11" -console-subscriber = { workspace = true } -unicase = "2.6.0" url = "2.2.2" uuid = { version = "1.1.0", features = ["v4"] } walkdir = "2.3.2" -which = "4.2.2" -whoami = "1.2.1" zip = { version = "0.6.2", default-features = false, features = ["deflate"] } [build-dependencies] diff --git a/build/build/src/ci_gen/job.rs b/build/build/src/ci_gen/job.rs index 13ec7d3dcb..a9d5538db2 100644 --- a/build/build/src/ci_gen/job.rs +++ b/build/build/src/ci_gen/job.rs @@ -167,12 +167,7 @@ impl JobArchetype for BuildWasm { pub struct BuildBackend; impl JobArchetype for BuildBackend { fn job(&self, os: OS) -> Job { - plain_job_customized(&os, "Build Backend", "backend get", |step| { - let step = step - // This prevents https://github.com/sbt/sbt-assembly/issues/496 - .with_env("LC_ALL", "C.UTF-8"); - vec![step] - }) + plain_job(&os, "Build Backend", "backend get") } } @@ -250,8 +245,8 @@ pub fn expose_os_specific_signing_secret(os: OS, step: Step) -> Step { secret::APPLE_NOTARIZATION_TEAM_ID, &crate::ide::web::env::APPLETEAMID, ) - .with_env(&crate::ide::web::env::CSC_IDENTITY_AUTO_DISCOVERY, "true") - .with_env(&crate::ide::web::env::CSC_FOR_PULL_REQUEST, "true"), + .with_env(crate::ide::web::env::CSC_IDENTITY_AUTO_DISCOVERY, "true") + .with_env(crate::ide::web::env::CSC_FOR_PULL_REQUEST, "true"), _ => step, } } @@ -334,9 +329,7 @@ impl JobArchetype for CiCheckBackend { .with_secret_exposed_as( secret::ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY, crate::aws::env::AWS_SECRET_ACCESS_KEY, - ) - // This prevents https://github.com/sbt/sbt-assembly/issues/496 - .with_env("LC_ALL", "C.UTF-8"); + ); vec![main_step, step::engine_test_reporter(os), step::stdlib_test_reporter(os)] }) .with_permission(Permission::Checks, Access::Write) diff --git a/build/build/src/engine/sbt.rs b/build/build/src/engine/sbt.rs index 99e20df80e..a628d4e624 100644 --- a/build/build/src/engine/sbt.rs +++ b/build/build/src/engine/sbt.rs @@ -39,6 +39,8 @@ impl CommandProvider for Context { for property in &self.system_properties { cmd.args(property); } + // This prevents https://github.com/sbt/sbt-assembly/issues/496 + cmd.env(ide_ci::env::known::LC_ALL, ide_ci::env::known::C_UTF8); Ok(cmd) } } diff --git a/build/ci-gen/src/main.rs b/build/ci-gen/src/main.rs index 16a5096a17..afa32f2003 100644 --- a/build/ci-gen/src/main.rs +++ b/build/ci-gen/src/main.rs @@ -43,6 +43,9 @@ async fn main() -> Result { ide_ci::fs::tokio::write(path, contents).await?; } - warn!("Remember to run formatter on the generated files!"); + // Ensure that generated files are properly formatted. + enso_build::web::install(&repo_root).await?; + enso_build::web::run_script(&repo_root, enso_build::web::Script::Format).await?; + Ok(()) } diff --git a/build/ci_utils/Cargo.toml b/build/ci_utils/Cargo.toml index 0e9ca4712f..0ae0641453 100644 --- a/build/ci_utils/Cargo.toml +++ b/build/ci_utils/Cargo.toml @@ -11,31 +11,24 @@ async-trait = "0.1.51" bincode = "1.3.3" byte-unit = { workspace = true } bytes = { workspace = true } -cached = "0.39.0" -convert_case = { workspace = true } -cfg-if = "1.0.0" chrono = { version = "0.4.19", features = ["serde"] } clap = { version = "3.1.5", features = ["derive", "env"] } -cron = "0.12.0" data-encoding = "2.3.2" dependency_runner = "1.0.0" derivative = { workspace = true } derive_more = { workspace = true } -dirs = "4.0.0" +dirs = { workspace = true } enso-build-base = { path = "../base" } enso-zst = { path = "../../lib/rust/zst" } -filetime = "0.2.15" flate2 = "1.0.22" flume = "0.10.10" fs_extra = "1.2.0" futures = { workspace = true } futures-util = "0.3.17" glob = "0.3.0" -graphql_client = "0.11.0" headers = "0.3.7" heck = "0.4.0" http-serde = "1.1.0" -indexmap = "1.7.0" indicatif = { version = "0.17.1", features = ["tokio"] } itertools = { workspace = true } lazy_static = { workspace = true } @@ -43,33 +36,23 @@ log = "0.4.14" mime = "0.3.16" multimap = "0.8.3" new_mime_guess = "4.0.0" -nix = { workspace = true } octocrab = { workspace = true } paste = { workspace = true } path-absolutize = "3.0.11" pathdiff = "0.2.1" path-slash = "0.2.1" -platforms = "3.0.0" -pin-project = "1.0.8" -port_check = "0.1.5" -pretty_env_logger = "0.4.0" -proc-macro2 = { workspace = true } -quote = { workspace = true } +platforms = { workspace = true } rand = "0.8.4" regex = { workspace = true } -reqwest = { version = "0.11.5", default-features = false, features = [ - "stream", -] } +reqwest = { workspace = true } semver = { workspace = true } -serde = { version = "1.0.130", features = ["derive"] } +serde = { workspace = true } serde_json = { workspace = true } serde_yaml = { workspace = true } -scopeguard = "1.1.0" sha2 = "0.10.2" strum = { workspace = true } symlink = "0.1.0" -syn = { workspace = true } -sysinfo = "0.26.2" +sysinfo = { workspace = true } tar = "0.4.37" tempfile = "3.2.0" tokio = { workspace = true } @@ -82,7 +65,6 @@ url = "2.2.2" uuid = { version = "1.1.0", features = ["v4", "serde"] } walkdir = "2.3.2" which = "4.2.2" -whoami = "1.2.1" zip = { version = "0.6.2", default-features = false, features = ["deflate"] } [dev-dependencies] diff --git a/build/ci_utils/src/actions/workflow/definition.rs b/build/ci_utils/src/actions/workflow/definition.rs index 0a8738bd1b..27b237f3ac 100644 --- a/build/ci_utils/src/actions/workflow/definition.rs +++ b/build/ci_utils/src/actions/workflow/definition.rs @@ -836,7 +836,7 @@ impl Step { input: impl AsRef, given_name: impl Into, ) -> Self { - let input_expr = get_input_expression(format!("secrets.{}", input.as_ref())); + let input_expr = get_input_expression(input.as_ref()); self.with_env(given_name, input_expr) } diff --git a/build/ci_utils/src/env.rs b/build/ci_utils/src/env.rs index 6f60f3a4f9..55787cad05 100644 --- a/build/ci_utils/src/env.rs +++ b/build/ci_utils/src/env.rs @@ -62,7 +62,7 @@ pub fn remove_var>(key: K) { /// define_env_var! { /// /// Documentation. /// ENV_VAR_NAME, PathBuf; -/// }; +/// } /// let path = ENV_VAR_NAME.get().unwrap_or_else(|_error| PathBuf::from("default")); /// ``` #[macro_export] @@ -117,18 +117,6 @@ pub fn prepend_to_path(path: impl AsRef) -> Result { known::PATH.prepend(path) } -// pub async fn fix_duplicated_env_var(var_name: impl AsRef) -> Result { -// let var_name = var_name.as_ref(); -// -// let mut paths = indexmap::IndexSet::new(); -// while let Ok(path) = std::env::var(var_name) { -// paths.extend(std::env::split_paths(&path)); -// std::env::remove_var(var_name); -// } -// crate::env::set_var(var_name, std::env::join_paths(paths)?); -// Ok(()) -// } - /// A modification to some environment variable. #[derive(Clone, Debug)] pub enum Action { diff --git a/build/ci_utils/src/env/accessor.rs b/build/ci_utils/src/env/accessor.rs index d8f90c28ae..41f68a873e 100644 --- a/build/ci_utils/src/env/accessor.rs +++ b/build/ci_utils/src/env/accessor.rs @@ -124,7 +124,7 @@ impl TypedVariable for PathBufVariable { } } -#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, derive_more::Deref)] +#[derive(Clone, Copy, Debug, Ord, PartialOrd, Eq, PartialEq, derive_more::Deref)] pub struct SimpleVariable { #[deref] pub name: &'static str, @@ -144,6 +144,12 @@ impl const AsRef for SimpleVariable AsRef for SimpleVariable { + fn as_ref(&self) -> &OsStr { + OsStr::new(self.name) + } +} + impl From<&SimpleVariable> for String { fn from(value: &SimpleVariable) -> Self { value.name.to_string() diff --git a/build/ci_utils/src/env/known.rs b/build/ci_utils/src/env/known.rs index d24f803a47..2d08805e8d 100644 --- a/build/ci_utils/src/env/known.rs +++ b/build/ci_utils/src/env/known.rs @@ -1,5 +1,6 @@ //! Universally known environment variables. +use crate::define_env_var; use crate::env::accessor::PathLike; @@ -9,3 +10,17 @@ use crate::env::accessor::PathLike; /// It is a special variable that contains a list of paths, that define the search path for /// executable files. pub const PATH: PathLike = PathLike("PATH"); + +define_env_var! { + /// Variable in Unix-like systems that overrides individual `LC_*` settings for locale-specific + /// program behavior, such as time formatting (`LC_TIME`), string sorting (`LC_COLLATE`), and + /// currency formatting (`LC_MONETARY`). Setting `LC_ALL` ensures uniform application of locale + /// settings, commonly utilized in scripting and debugging to maintain consistency irrespective + /// of user-specific configurations. + LC_ALL, String; +} + +/// The `C.UTF-8` locale, when used as a value for [`LC_ALL`] or other `LC_*` environment variables +/// in Unix-like systems, combines the minimalistic behavior of the default C locale with UTF-8 +/// character encoding. +pub const C_UTF8: &str = "C.UTF-8"; diff --git a/build/cli/Cargo.toml b/build/cli/Cargo.toml index af0b179294..98e5c0a7ef 100644 --- a/build/cli/Cargo.toml +++ b/build/cli/Cargo.toml @@ -2,30 +2,23 @@ name = "enso-build-cli" version = "0.1.0" edition = "2021" +default-run = "enso-build-cli" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] anyhow = { workspace = true } byte-unit = { workspace = true } clap = { version = "3.2.23", features = ["derive", "env", "wrap_help"] } -chrono = "0.4.19" derivative = { workspace = true } enso-build-base = { path = "../base" } enso-build = { path = "../build" } enso-formatter = { path = "../enso-formatter" } -ensogl-pack = { path = "../../lib/rust/ensogl/pack" } -futures = { workspace = true } futures-util = "0.3.17" glob = "0.3.0" humantime = "2.1.0" ide-ci = { path = "../ci_utils" } octocrab = { workspace = true } -serde = { version = "1.0.130", features = ["derive"] } -serde_json = { workspace = true } -serde_yaml = { workspace = true } -strum = { workspace = true } tempfile = "3.2.0" tokio = { workspace = true } toml = "0.5.9" tracing = { version = "0.1.37" } -tracing-subscriber = "0.3.11" diff --git a/lib/rust/config-reader/Cargo.toml b/lib/rust/config-reader/Cargo.toml index 383f59829c..73565133a1 100644 --- a/lib/rust/config-reader/Cargo.toml +++ b/lib/rust/config-reader/Cargo.toml @@ -8,6 +8,6 @@ edition = "2021" crate-type = ["rlib"] [dependencies] -serde = { version = "1.0" } +serde = { workspace = true } serde_yaml = { workspace = true } Inflector = { version = "0.11.4" } diff --git a/lib/rust/data-structures/Cargo.toml b/lib/rust/data-structures/Cargo.toml index a5834c4814..21235ae66c 100644 --- a/lib/rust/data-structures/Cargo.toml +++ b/lib/rust/data-structures/Cargo.toml @@ -17,7 +17,7 @@ crate-type = ["rlib", "cdylib"] [dependencies] enso-prelude = { path = "../prelude" } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } typenum = { version = "1.11.2" } rustversion = { version = "1.0" } failure = { workspace = true } diff --git a/lib/rust/ensogl/component/text/Cargo.toml b/lib/rust/ensogl/component/text/Cargo.toml index 2b4e7857fa..e32b8d1953 100644 --- a/lib/rust/ensogl/component/text/Cargo.toml +++ b/lib/rust/ensogl/component/text/Cargo.toml @@ -22,7 +22,7 @@ const_format = { workspace = true } xi-rope = { version = "0.3.0" } owned_ttf_parser = { workspace = true } bincode = { workspace = true } -serde = { version = "1", features = ["rc"] } +serde = { workspace = true } serde_json = { workspace = true } ordered-float = { workspace = true } rustybuzz = { workspace = true } diff --git a/lib/rust/ensogl/component/text/src/font/msdf/Cargo.toml b/lib/rust/ensogl/component/text/src/font/msdf/Cargo.toml index 0fcc3d55a7..e8ccd9de64 100644 --- a/lib/rust/ensogl/component/text/src/font/msdf/Cargo.toml +++ b/lib/rust/ensogl/component/text/src/font/msdf/Cargo.toml @@ -16,7 +16,7 @@ failure = { workspace = true } js-sys = { workspace = true } nalgebra = { workspace = true } wasm-bindgen = { workspace = true } -serde = { version = "1", features = ["rc", "derive"] } +serde = { workspace = true } owned_ttf_parser = { workspace = true } enso-web = { path = "../../../../../../web" } diff --git a/lib/rust/ensogl/core/Cargo.toml b/lib/rust/ensogl/core/Cargo.toml index 21b776ff54..86b4c6cf36 100644 --- a/lib/rust/ensogl/core/Cargo.toml +++ b/lib/rust/ensogl/core/Cargo.toml @@ -46,7 +46,7 @@ num-traits = { version = "0.2" } ordered-float = { workspace = true } rustc-hash = { version = "1.0.1" } semver = { workspace = true } -serde = { version = "1" } +serde = { workspace = true } smallvec = { workspace = true } typenum = { version = "1.11.2" } # We require exact version of wasm-bindgen because we do patching final js in our build process, diff --git a/lib/rust/ensogl/pack/Cargo.toml b/lib/rust/ensogl/pack/Cargo.toml index 2bffa5ea07..18d6f1de44 100644 --- a/lib/rust/ensogl/pack/Cargo.toml +++ b/lib/rust/ensogl/pack/Cargo.toml @@ -11,12 +11,8 @@ crate-type = ["rlib"] futures = { version = "0.3" } ide-ci = { path = "../../../../build/ci_utils" } manifest-dir-macros = "0.1.16" -regex = { workspace = true } -serde = { version = "1.0.130", features = ["derive"] } +serde = { workspace = true } serde_json = { workspace = true } -tempfile = "3" tokio = { workspace = true } -fs_extra = "1.2.0" walkdir = "2" -enso-bitmap = { path = "../../bitmap" } enso-prelude = { path = "../../prelude" } diff --git a/lib/rust/generics/Cargo.toml b/lib/rust/generics/Cargo.toml index 5f64f30360..758e0906e2 100644 --- a/lib/rust/generics/Cargo.toml +++ b/lib/rust/generics/Cargo.toml @@ -16,7 +16,7 @@ publish = true [dependencies] enso-zst = { path = "../zst" } -serde = { version = "1.0.0", features = ["derive"] } +serde = { workspace = true } nalgebra = { workspace = true } paste = { workspace = true } derivative = { workspace = true } diff --git a/lib/rust/json-rpc/Cargo.toml b/lib/rust/json-rpc/Cargo.toml index fc04b507fa..5d0fddadcf 100644 --- a/lib/rust/json-rpc/Cargo.toml +++ b/lib/rust/json-rpc/Cargo.toml @@ -15,5 +15,5 @@ enso-profiler-data = { path = "../profiler/data" } enso-profiler = { path = "../profiler" } futures = { version = "0.3.1" } failure = { workspace = true } -serde = { version = "1.0.0", features = ["derive"] } +serde = { workspace = true } serde_json = { workspace = true } diff --git a/lib/rust/json-to-struct/Cargo.toml b/lib/rust/json-to-struct/Cargo.toml index 933df10969..239866a60a 100644 --- a/lib/rust/json-to-struct/Cargo.toml +++ b/lib/rust/json-to-struct/Cargo.toml @@ -9,6 +9,6 @@ proc-macro = true [dependencies] enso-prelude = { path = "../prelude" } -serde = { version = "1.0" } +serde = { workspace = true } serde_json = { workspace = true } proc-macro2 = "1.0" diff --git a/lib/rust/metamodel/lexpr/Cargo.toml b/lib/rust/metamodel/lexpr/Cargo.toml index e4b5b8c248..ed5d853a6e 100644 --- a/lib/rust/metamodel/lexpr/Cargo.toml +++ b/lib/rust/metamodel/lexpr/Cargo.toml @@ -12,5 +12,5 @@ enso-metamodel = { path = "../" } derivative = { workspace = true } [dev-dependencies] -serde = { version = "1", features = ["derive"] } +serde = { workspace = true } enso-reflect = { path = "../../reflect" } diff --git a/lib/rust/parser/Cargo.toml b/lib/rust/parser/Cargo.toml index 06f2abfc7c..5292a025fb 100644 --- a/lib/rust/parser/Cargo.toml +++ b/lib/rust/parser/Cargo.toml @@ -16,7 +16,7 @@ enso-data-structures = { path = "../data-structures" } enso-types = { path = "../types" } enso-shapely-macros = { path = "../shapely/macros" } enso-parser-syntax-tree-visitor = { path = "src/syntax/tree/visitor" } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } serde_json = { workspace = true } uuid = { version = "1.1", features = ["serde"] } bincode = "1.3" diff --git a/lib/rust/parser/debug/Cargo.toml b/lib/rust/parser/debug/Cargo.toml index adb3b586de..5a3132b3a6 100644 --- a/lib/rust/parser/debug/Cargo.toml +++ b/lib/rust/parser/debug/Cargo.toml @@ -15,5 +15,5 @@ enso-metamodel = { path = "../../metamodel", features = ["rust"] } enso-metamodel-lexpr = { path = "../../metamodel/lexpr" } enso-reflect = { path = "../../reflect" } lexpr = "0.2.6" -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } serde_json = { workspace = true } diff --git a/lib/rust/parser/doc-parser/Cargo.toml b/lib/rust/parser/doc-parser/Cargo.toml index 8c5b1168fe..ae463c7538 100644 --- a/lib/rust/parser/doc-parser/Cargo.toml +++ b/lib/rust/parser/doc-parser/Cargo.toml @@ -14,7 +14,7 @@ enso-parser = { path = ".." } enso-prelude = { path = "../../prelude" } enso-profiler = { path = "../../profiler" } enso-reflect = { path = "../../reflect" } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } [dev-dependencies] enso-metamodel = { path = "../../metamodel", features = ["rust"] } diff --git a/lib/rust/parser/schema/Cargo.toml b/lib/rust/parser/schema/Cargo.toml index 8c70148087..84cb4731e7 100644 --- a/lib/rust/parser/schema/Cargo.toml +++ b/lib/rust/parser/schema/Cargo.toml @@ -13,7 +13,7 @@ license-file = "../../LICENSE" enso-metamodel = { path = "../../metamodel", features = ["rust"] } enso-parser = { path = ".." } enso-reflect = { path = "../../reflect", features = ["graphviz"] } -serde = { version = "1", features = ["derive"] } +serde = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] serde_json = { workspace = true } diff --git a/lib/rust/prelude/Cargo.toml b/lib/rust/prelude/Cargo.toml index f44a9ad27a..4b6e0e6a4c 100644 --- a/lib/rust/prelude/Cargo.toml +++ b/lib/rust/prelude/Cargo.toml @@ -31,7 +31,7 @@ futures = { workspace = true } itertools = { workspace = true } lazy_static = { workspace = true } paste = { workspace = true } -serde = { version = "1.0.126", features = ["derive", "rc"] } +serde = { workspace = true } serde_json = { workspace = true } smallvec = { workspace = true } wasm-bindgen = { workspace = true } diff --git a/lib/rust/profiler/Cargo.toml b/lib/rust/profiler/Cargo.toml index 7dd823d887..b03a1853eb 100644 --- a/lib/rust/profiler/Cargo.toml +++ b/lib/rust/profiler/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Enso Team "] [dependencies] futures = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } serde_json = { version = "1.0.59", features = ["raw_value"] } wasm-bindgen = { workspace = true } enso-profiler-macros = { path = "macros" } diff --git a/lib/rust/profiler/data/Cargo.toml b/lib/rust/profiler/data/Cargo.toml index e54a6d8384..840031d252 100644 --- a/lib/rust/profiler/data/Cargo.toml +++ b/lib/rust/profiler/data/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Enso Team "] [dependencies] derivative = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } serde_json = { workspace = true } enso-prelude = { path = "../../prelude" } enso-profiler = { path = "../" } diff --git a/lib/rust/shapely/Cargo.toml b/lib/rust/shapely/Cargo.toml index 26f9251fc7..98ba2d1913 100644 --- a/lib/rust/shapely/Cargo.toml +++ b/lib/rust/shapely/Cargo.toml @@ -21,9 +21,6 @@ default = [] [dependencies] enso-zst = { path = "../zst" } enso-shapely-macros = { path = "macros" } -paste = { workspace = true } -derivative = { workspace = true } -rustversion = { version = "1.0" } wasm-bindgen = { workspace = true } [dependencies.web-sys] diff --git a/lib/rust/shapely/macros/Cargo.toml b/lib/rust/shapely/macros/Cargo.toml index a419c1bb25..8d1f055358 100644 --- a/lib/rust/shapely/macros/Cargo.toml +++ b/lib/rust/shapely/macros/Cargo.toml @@ -30,6 +30,3 @@ paste = { workspace = true } [dependencies.syn] version = "1.0" features = ['extra-traits', 'visit', 'full'] - -[dev-dependencies] -wasm-bindgen-test = "0.3.8" diff --git a/lib/rust/shortcuts/Cargo.toml b/lib/rust/shortcuts/Cargo.toml index 60b307680b..51d636b547 100644 --- a/lib/rust/shortcuts/Cargo.toml +++ b/lib/rust/shortcuts/Cargo.toml @@ -15,7 +15,7 @@ enso-web = { path = "../web" } wasm-bindgen = { workspace = true } nalgebra = { workspace = true } serde_json = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } js-sys = { workspace = true } [dependencies.web-sys] diff --git a/lib/rust/shortcuts/example/Cargo.toml b/lib/rust/shortcuts/example/Cargo.toml index d5064b0180..62958f5fcb 100644 --- a/lib/rust/shortcuts/example/Cargo.toml +++ b/lib/rust/shortcuts/example/Cargo.toml @@ -16,7 +16,7 @@ enso-web = { path = "../../web" } wasm-bindgen = { workspace = true } nalgebra = { workspace = true } serde_json = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } js-sys = { workspace = true } [dependencies.web-sys] diff --git a/lib/rust/text/Cargo.toml b/lib/rust/text/Cargo.toml index 08fbdc8edc..34b8d0b853 100644 --- a/lib/rust/text/Cargo.toml +++ b/lib/rust/text/Cargo.toml @@ -11,4 +11,4 @@ crate-type = ["rlib", "cdylib"] enso-prelude = { path = "../prelude" } enso-types = { path = "../types" } xi-rope = { version = "0.3.0" } -serde = { version = "1", features = ["derive"] } +serde = { workspace = true } diff --git a/lib/rust/types/Cargo.toml b/lib/rust/types/Cargo.toml index ce0a6584a5..1bb8eaaf5c 100644 --- a/lib/rust/types/Cargo.toml +++ b/lib/rust/types/Cargo.toml @@ -11,7 +11,7 @@ enso-reflect = { path = "../reflect" } nalgebra = { workspace = true } num-traits = { version = "0.2" } paste = { workspace = true } -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } enso-prelude = { path = "../prelude" } [build-dependencies] diff --git a/lib/rust/zst/Cargo.toml b/lib/rust/zst/Cargo.toml index 8caacbd24c..5402849b17 100644 --- a/lib/rust/zst/Cargo.toml +++ b/lib/rust/zst/Cargo.toml @@ -18,5 +18,5 @@ default = [] [dependencies] bytemuck = { workspace = true } -serde = { version = "1.0.126", features = ["derive", "rc"] } +serde = { workspace = true } paste = { workspace = true } diff --git a/run b/run index 6368f5afe7..c3ec5e1523 100755 --- a/run +++ b/run @@ -1,12 +1,4 @@ #!/usr/bin/env bash set -e # Exit on error. -# Get the directory of the script, as per https://stackoverflow.com/a/246128 -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -BIN_CRATE_NAME=enso-build-cli -TARGET_DIR="${SCRIPT_DIR}/target/enso-build/" -TARGET_EXE="${TARGET_DIR}buildscript/${BIN_CRATE_NAME}" - -cargo build --profile buildscript --target-dir "$TARGET_DIR" --package ${BIN_CRATE_NAME} -"$TARGET_EXE" $@ +cargo run --profile buildscript --package enso-build-cli -- $@ diff --git a/run.cmd b/run.cmd index 379b94751e..891f5bafef 100644 --- a/run.cmd +++ b/run.cmd @@ -1,6 +1,4 @@ @ pushd %~dp0 -@ set TARGET_DIR=%~dp0target\enso-build -@ set TARGET_EXE=%TARGET_DIR%\buildscript\enso-build-cli.exe -cargo build --profile buildscript --target-dir "%TARGET_DIR%" --package enso-build-cli && "%TARGET_EXE%" %* +cargo run --profile buildscript --package enso-build-cli -- %* @ popd @ exit /b %ERRORLEVEL% diff --git a/run.ps1 b/run.ps1 index 502bc97bd1..e57b6d2e3f 100644 --- a/run.ps1 +++ b/run.ps1 @@ -5,17 +5,12 @@ # # This was developed and tested on Windows only, though there is no reason # why it should not work on other platforms through PowerShell Core. -$ErrorActionPreference = "Stop" -$TargetDir = Join-Path $PSScriptRoot "target" "enso-build" -$BuildScriptProfile = "buildscript" -$BuildScriptBin = "enso-build-cli" -$TargetExe = Join-Path $TargetDir $BuildScriptProfile $BuildScriptBin +$RunArgs = @("run", "--profile", "buildscript", "--package", "enso-build-cli", "--") +$RunArgs += $args -$BuildArgs = "build", "--profile", $BuildScriptProfile, "--target-dir", $TargetDir, "--package", $BuildScriptBin -$BuildScriptProcess = Start-Process cargo -NoNewWindow -PassThru -Wait -WorkingDirectory $PSScriptRoot -ArgumentList $BuildArgs -if ($BuildScriptProcess.ExitCode -ne 0) { - Exit $BuildScriptProcess.ExitCode -} -$BuildScriptBinProcess = Start-Process $TargetExe -NoNewWindow -PassThru -Wait -WorkingDirectory $PSScriptRoot -ArgumentList $args -Exit $BuildScriptBinProcess.ExitCode +$psi = New-Object -TypeName System.Diagnostics.ProcessStartInfo -ArgumentList "cargo",$RunArgs +$psi.WorkingDirectory = $PSScriptRoot +$handle = [System.Diagnostics.Process]::Start($psi) +$handle.WaitForExit() +Exit $handle.ExitCode