From 9e884cf29664c967b924d15fd639b632fb7b6df6 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 23 Sep 2022 10:56:06 +0200 Subject: [PATCH 1/5] Upgrade to Rust 1.64.0 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 4a6c266200..cc8f987ef3 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.63.0" +channel = "1.64.0" components = ["rustfmt", "clippy"] From 25ac7834ae1be398739b488bdda3a9960a4ed007 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 23 Sep 2022 11:02:54 +0200 Subject: [PATCH 2/5] Move Cargo metadata to workspace --- Cargo.toml | 16 ++++++++++++++++ crates/fj-app/Cargo.toml | 22 +++++++++------------- crates/fj-export/Cargo.toml | 22 +++++++++------------- crates/fj-host/Cargo.toml | 22 +++++++++------------- crates/fj-interop/Cargo.toml | 23 +++++++++-------------- crates/fj-kernel/Cargo.toml | 24 +++++++++--------------- crates/fj-math/Cargo.toml | 22 +++++++++------------- crates/fj-operations/Cargo.toml | 23 +++++++++-------------- crates/fj-proc/Cargo.toml | 23 +++++++++-------------- crates/fj-viewer/Cargo.toml | 23 +++++++++-------------- crates/fj-window/Cargo.toml | 23 +++++++++-------------- crates/fj/Cargo.toml | 23 +++++++++-------------- 12 files changed, 115 insertions(+), 151 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5d414451c4..6dfb7443c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,3 +36,19 @@ default-members = [ "crates/fj-viewer", "crates/fj-window", ] + + +[workspace.package] +version = "0.16.0" +edition = "2021" + +description = """\ +Early-stage, next-generation, code-first CAD application. Because the world \ +needs another CAD program.\ +""" +readme = "README.md" +homepage = "https://www.fornjot.app/" +repository = "https://github.com/hannobraun/fornjot" +license = "0BSD" +keywords = ["cad", "programmatic", "code-cad"] +categories = ["encoding", "mathematics", "rendering"] diff --git a/crates/fj-app/Cargo.toml b/crates/fj-app/Cargo.toml index c406ed4b06..6dfd3f83c6 100644 --- a/crates/fj-app/Cargo.toml +++ b/crates/fj-app/Cargo.toml @@ -1,18 +1,14 @@ [package] name = "fj-app" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [dependencies] diff --git a/crates/fj-export/Cargo.toml b/crates/fj-export/Cargo.toml index 48b732d779..2511f7758c 100644 --- a/crates/fj-export/Cargo.toml +++ b/crates/fj-export/Cargo.toml @@ -1,18 +1,14 @@ [package] name = "fj-export" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [dependencies] diff --git a/crates/fj-host/Cargo.toml b/crates/fj-host/Cargo.toml index 649024d8a3..e5b64130bd 100644 --- a/crates/fj-host/Cargo.toml +++ b/crates/fj-host/Cargo.toml @@ -1,18 +1,14 @@ [package] name = "fj-host" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [dependencies] diff --git a/crates/fj-interop/Cargo.toml b/crates/fj-interop/Cargo.toml index 87983f61aa..e2ccaa9bd9 100644 --- a/crates/fj-interop/Cargo.toml +++ b/crates/fj-interop/Cargo.toml @@ -1,19 +1,14 @@ [package] name = "fj-interop" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] - +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [dependencies.fj-math] path = "../fj-math" diff --git a/crates/fj-kernel/Cargo.toml b/crates/fj-kernel/Cargo.toml index 911fdf5782..a9fc90a0f1 100644 --- a/crates/fj-kernel/Cargo.toml +++ b/crates/fj-kernel/Cargo.toml @@ -1,19 +1,14 @@ [package] name = "fj-kernel" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] - +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [dependencies] parking_lot = "0.12.0" @@ -31,6 +26,5 @@ path = "../fj-interop" version = "0.16.0" path = "../fj-math" - [dev-dependencies] anyhow = "1.0.65" diff --git a/crates/fj-math/Cargo.toml b/crates/fj-math/Cargo.toml index 4e95130408..3627df0053 100644 --- a/crates/fj-math/Cargo.toml +++ b/crates/fj-math/Cargo.toml @@ -1,18 +1,14 @@ [package] name = "fj-math" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [dependencies] approx = "0.5.1" diff --git a/crates/fj-operations/Cargo.toml b/crates/fj-operations/Cargo.toml index 83c17a0987..b6e26ab200 100644 --- a/crates/fj-operations/Cargo.toml +++ b/crates/fj-operations/Cargo.toml @@ -1,19 +1,14 @@ [package] name = "fj-operations" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] - +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [dependencies] thiserror = "1.0.35" diff --git a/crates/fj-proc/Cargo.toml b/crates/fj-proc/Cargo.toml index c88fc4b0ff..150261339f 100644 --- a/crates/fj-proc/Cargo.toml +++ b/crates/fj-proc/Cargo.toml @@ -1,23 +1,18 @@ [package] name = "fj-proc" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [lib] proc-macro = true - [dependencies] proc-macro2 = "1.0.43" quote = "1.0.21" diff --git a/crates/fj-viewer/Cargo.toml b/crates/fj-viewer/Cargo.toml index 586774db00..9f2899df21 100644 --- a/crates/fj-viewer/Cargo.toml +++ b/crates/fj-viewer/Cargo.toml @@ -1,19 +1,14 @@ [package] name = "fj-viewer" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] - +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [dependencies] bytemuck = "1.12.1" diff --git a/crates/fj-window/Cargo.toml b/crates/fj-window/Cargo.toml index e983a6f628..35fcd6d3a0 100644 --- a/crates/fj-window/Cargo.toml +++ b/crates/fj-window/Cargo.toml @@ -1,19 +1,14 @@ [package] name = "fj-window" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] - +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [dependencies] futures = "0.3.24" diff --git a/crates/fj/Cargo.toml b/crates/fj/Cargo.toml index 78f2a961fb..d91fee0f83 100644 --- a/crates/fj/Cargo.toml +++ b/crates/fj/Cargo.toml @@ -1,19 +1,14 @@ [package] name = "fj" -version = "0.16.0" -edition = "2021" - -description = """\ -Early-stage, next-generation, code-first CAD application. Because the world \ -needs another CAD program.\ -""" -readme = "../../README.md" -homepage = "https://www.fornjot.app/" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["encoding", "mathematics", "rendering"] - +version.workspace = true +edition.workspace = true +description.workspace = true +readme.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true [dependencies] serde = { version = "1.0.144", features = ["derive"], optional = true } From 35162a4606c4cac357dd941fb31ee71b2122b449 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 23 Sep 2022 11:16:42 +0200 Subject: [PATCH 3/5] Specify all Fornjot dependencies in workspace --- Cargo.toml | 41 ++++++++++++++++++++++++++++++ crates/fj-app/Cargo.toml | 45 +++++++-------------------------- crates/fj-export/Cargo.toml | 10 ++------ crates/fj-host/Cargo.toml | 10 ++------ crates/fj-interop/Cargo.toml | 5 ++-- crates/fj-kernel/Cargo.toml | 10 ++------ crates/fj-operations/Cargo.toml | 20 +++------------ crates/fj-proc/Cargo.toml | 2 +- crates/fj-viewer/Cargo.toml | 10 ++------ crates/fj-window/Cargo.toml | 20 +++------------ crates/fj/Cargo.toml | 5 +--- 11 files changed, 70 insertions(+), 108 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6dfb7443c2..eca0b4937e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,3 +52,44 @@ repository = "https://github.com/hannobraun/fornjot" license = "0BSD" keywords = ["cad", "programmatic", "code-cad"] categories = ["encoding", "mathematics", "rendering"] + + +[workspace.dependencies.fj] +version = "0.16.0" +path = "crates/fj" + +[workspace.dependencies.fj-export] +version = "0.16.0" +path = "crates/fj-export" + +[workspace.dependencies.fj-host] +version = "0.16.0" +path = "crates/fj-host" + +[workspace.dependencies.fj-interop] +version = "0.16.0" +path = "crates/fj-interop" + +[workspace.dependencies.fj-kernel] +version = "0.16.0" +path = "crates/fj-kernel" + +[workspace.dependencies.fj-math] +version = "0.16.0" +path = "crates/fj-math" + +[workspace.dependencies.fj-operations] +version = "0.16.0" +path = "crates/fj-operations" + +[workspace.dependencies.fj-proc] +version = "0.16.0" +path = "crates/fj-proc" + +[workspace.dependencies.fj-viewer] +version = "0.16.0" +path = "crates/fj-viewer" + +[workspace.dependencies.fj-window] +version = "0.16.0" +path = "crates/fj-window" diff --git a/crates/fj-app/Cargo.toml b/crates/fj-app/Cargo.toml index 6dfd3f83c6..233dc6d77c 100644 --- a/crates/fj-app/Cargo.toml +++ b/crates/fj-app/Cargo.toml @@ -13,6 +13,15 @@ categories.workspace = true [dependencies] anyhow = "1.0.65" +fj.workspace = true +fj-export.workspace = true +fj-host.workspace = true +fj-interop.workspace = true +fj-kernel.workspace = true +fj-math.workspace = true +fj-operations.workspace = true +fj-viewer.workspace = true +fj-window.workspace = true [dependencies.clap] version = "3.2.22" @@ -22,42 +31,6 @@ features = ["derive"] version = "0.10.6" features = ["env", "toml"] -[dependencies.fj] -version = "0.16.0" -path = "../fj" - -[dependencies.fj-export] -version = "0.16.0" -path = "../fj-export" - -[dependencies.fj-host] -version = "0.16.0" -path = "../fj-host" - -[dependencies.fj-interop] -version = "0.16.0" -path = "../fj-interop" - -[dependencies.fj-kernel] -version = "0.16.0" -path = "../fj-kernel" - -[dependencies.fj-math] -version = "0.16.0" -path = "../fj-math" - -[dependencies.fj-operations] -version = "0.16.0" -path = "../fj-operations" - -[dependencies.fj-viewer] -version = "0.16.0" -path = "../fj-viewer" - -[dependencies.fj-window] -version = "0.16.0" -path = "../fj-window" - [dependencies.serde] version = "1.0.144" features = ["derive"] diff --git a/crates/fj-export/Cargo.toml b/crates/fj-export/Cargo.toml index 2511f7758c..82aa7f10e9 100644 --- a/crates/fj-export/Cargo.toml +++ b/crates/fj-export/Cargo.toml @@ -12,14 +12,8 @@ categories.workspace = true [dependencies] +fj-interop.workspace = true +fj-math.workspace = true thiserror = "1.0.35" threemf = "0.3.1" stl = "0.2.1" - -[dependencies.fj-interop] -version = "0.16.0" -path = "../fj-interop" - -[dependencies.fj-math] -version = "0.16.0" -path = "../fj-math" diff --git a/crates/fj-host/Cargo.toml b/crates/fj-host/Cargo.toml index e5b64130bd..6ecd41b166 100644 --- a/crates/fj-host/Cargo.toml +++ b/crates/fj-host/Cargo.toml @@ -12,15 +12,9 @@ categories.workspace = true [dependencies] +fj.workspace = true +fj-interop.workspace = true libloading = "0.7.2" notify = "5.0.0" thiserror = "1.0.35" cargo_metadata = "0.15.0" - -[dependencies.fj] -version = "0.16.0" -path = "../fj" - -[dependencies.fj-interop] -version = "0.16.0" -path = "../fj-interop" diff --git a/crates/fj-interop/Cargo.toml b/crates/fj-interop/Cargo.toml index e2ccaa9bd9..e40226a366 100644 --- a/crates/fj-interop/Cargo.toml +++ b/crates/fj-interop/Cargo.toml @@ -10,6 +10,5 @@ license.workspace = true keywords.workspace = true categories.workspace = true -[dependencies.fj-math] -path = "../fj-math" -version = "0.16.0" +[dependencies] +fj-math.workspace = true diff --git a/crates/fj-kernel/Cargo.toml b/crates/fj-kernel/Cargo.toml index a9fc90a0f1..af4daf7972 100644 --- a/crates/fj-kernel/Cargo.toml +++ b/crates/fj-kernel/Cargo.toml @@ -11,6 +11,8 @@ keywords.workspace = true categories.workspace = true [dependencies] +fj-interop.workspace = true +fj-math.workspace = true parking_lot = "0.12.0" parry2d-f64 = "0.9.0" pretty_assertions = "1.3.0" @@ -18,13 +20,5 @@ robust-predicates = "0.1.3" spade = "2.0.0" thiserror = "1.0.35" -[dependencies.fj-interop] -version = "0.16.0" -path = "../fj-interop" - -[dependencies.fj-math] -version = "0.16.0" -path = "../fj-math" - [dev-dependencies] anyhow = "1.0.65" diff --git a/crates/fj-operations/Cargo.toml b/crates/fj-operations/Cargo.toml index b6e26ab200..7cc1a9cb40 100644 --- a/crates/fj-operations/Cargo.toml +++ b/crates/fj-operations/Cargo.toml @@ -11,20 +11,8 @@ keywords.workspace = true categories.workspace = true [dependencies] +fj.workspace = true +fj-interop.workspace = true +fj-kernel.workspace = true +fj-math.workspace = true thiserror = "1.0.35" - -[dependencies.fj] -version = "0.16.0" -path = "../fj" - -[dependencies.fj-math] -version = "0.16.0" -path = "../fj-math" - -[dependencies.fj-interop] -version = "0.16.0" -path = "../fj-interop" - -[dependencies.fj-kernel] -version = "0.16.0" -path = "../fj-kernel" diff --git a/crates/fj-proc/Cargo.toml b/crates/fj-proc/Cargo.toml index 150261339f..3a1a008027 100644 --- a/crates/fj-proc/Cargo.toml +++ b/crates/fj-proc/Cargo.toml @@ -26,4 +26,4 @@ version = "1.0.100" features = ["full", "extra-traits"] [dev-dependencies] -fj = { path = "../fj" } +fj.workspace = true diff --git a/crates/fj-viewer/Cargo.toml b/crates/fj-viewer/Cargo.toml index 9f2899df21..bbf802ac6c 100644 --- a/crates/fj-viewer/Cargo.toml +++ b/crates/fj-viewer/Cargo.toml @@ -12,20 +12,14 @@ categories.workspace = true [dependencies] bytemuck = "1.12.1" +fj-interop.workspace = true +fj-math.workspace = true raw-window-handle = "0.4.3" thiserror = "1.0.35" tracing = "0.1.35" wgpu = "0.13.1" wgpu_glyph = "0.17.0" -[dependencies.fj-interop] -version = "0.16.0" -path = "../fj-interop" - -[dependencies.fj-math] -version = "0.16.0" -path = "../fj-math" - [dependencies.egui] version = "0.19.0" diff --git a/crates/fj-window/Cargo.toml b/crates/fj-window/Cargo.toml index 35fcd6d3a0..070fd6a963 100644 --- a/crates/fj-window/Cargo.toml +++ b/crates/fj-window/Cargo.toml @@ -11,23 +11,11 @@ keywords.workspace = true categories.workspace = true [dependencies] +fj-host.workspace = true +fj-operations.workspace = true +fj-viewer.workspace = true +fj-interop.workspace = true futures = "0.3.24" thiserror = "1.0.35" tracing = "0.1.35" winit = "0.27.3" - -[dependencies.fj-host] -version = "0.16.0" -path = "../fj-host" - -[dependencies.fj-operations] -version = "0.16.0" -path = "../fj-operations" - -[dependencies.fj-viewer] -version = "0.16.0" -path = "../fj-viewer" - -[dependencies.fj-interop] -version = "0.16.0" -path = "../fj-interop" diff --git a/crates/fj/Cargo.toml b/crates/fj/Cargo.toml index d91fee0f83..962efb1437 100644 --- a/crates/fj/Cargo.toml +++ b/crates/fj/Cargo.toml @@ -11,11 +11,8 @@ keywords.workspace = true categories.workspace = true [dependencies] +fj-proc.workspace = true serde = { version = "1.0.144", features = ["derive"], optional = true } -[dependencies.fj-proc] -version = "0.16.0" -path = "../../crates/fj-proc" - [dev-dependencies] serde_json = "1.0.85" From efbb056553579c56a54f6e469d948d4c7e10e1a4 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 23 Sep 2022 11:20:19 +0200 Subject: [PATCH 4/5] Format dependencies consistently --- crates/fj-viewer/Cargo.toml | 8 ++------ crates/fj/Cargo.toml | 6 +++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/fj-viewer/Cargo.toml b/crates/fj-viewer/Cargo.toml index bbf802ac6c..19d6055c92 100644 --- a/crates/fj-viewer/Cargo.toml +++ b/crates/fj-viewer/Cargo.toml @@ -12,6 +12,8 @@ categories.workspace = true [dependencies] bytemuck = "1.12.1" +egui = "0.19.0" +egui-winit = "0.19.0" fj-interop.workspace = true fj-math.workspace = true raw-window-handle = "0.4.3" @@ -20,12 +22,6 @@ tracing = "0.1.35" wgpu = "0.13.1" wgpu_glyph = "0.17.0" -[dependencies.egui] -version = "0.19.0" - [dependencies.egui-wgpu] version = "0.19.0" features = ["winit"] - -[dependencies.egui-winit] -version = "0.19.0" diff --git a/crates/fj/Cargo.toml b/crates/fj/Cargo.toml index 962efb1437..0c7202cf38 100644 --- a/crates/fj/Cargo.toml +++ b/crates/fj/Cargo.toml @@ -12,7 +12,11 @@ categories.workspace = true [dependencies] fj-proc.workspace = true -serde = { version = "1.0.144", features = ["derive"], optional = true } + +[dependencies.serde] +version = "1.0.144" +features = ["derive"] +optional = true [dev-dependencies] serde_json = "1.0.85" From 569f88777009a17f3ee6d2ed4e3628e8e3a87af6 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 23 Sep 2022 11:20:42 +0200 Subject: [PATCH 5/5] Restore alphabetic ordering of dependencies --- crates/fj-host/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/fj-host/Cargo.toml b/crates/fj-host/Cargo.toml index 6ecd41b166..c02df49349 100644 --- a/crates/fj-host/Cargo.toml +++ b/crates/fj-host/Cargo.toml @@ -12,9 +12,9 @@ categories.workspace = true [dependencies] +cargo_metadata = "0.15.0" fj.workspace = true fj-interop.workspace = true libloading = "0.7.2" notify = "5.0.0" thiserror = "1.0.35" -cargo_metadata = "0.15.0"