Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Rust 1.64.0 #1132

Merged
merged 5 commits into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,60 @@ 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"]


[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"
67 changes: 18 additions & 49 deletions crates/fj-app/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
[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]
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"
Expand All @@ -26,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"]
Expand Down
32 changes: 11 additions & 21 deletions crates/fj-export/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,29 +1,19 @@
[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]
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"
34 changes: 12 additions & 22 deletions crates/fj-host/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,30 +1,20 @@
[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]
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"

[dependencies.fj]
version = "0.16.0"
path = "../fj"

[dependencies.fj-interop]
version = "0.16.0"
path = "../fj-interop"
28 changes: 11 additions & 17 deletions crates/fj-interop/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
[package]
name = "fj-interop"
version = "0.16.0"
edition = "2021"
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

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"]


[dependencies.fj-math]
path = "../fj-math"
version = "0.16.0"
[dependencies]
fj-math.workspace = true
34 changes: 11 additions & 23 deletions crates/fj-kernel/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,36 +1,24 @@
[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]
fj-interop.workspace = true
fj-math.workspace = true
parking_lot = "0.12.0"
parry2d-f64 = "0.9.0"
pretty_assertions = "1.3.0"
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"
22 changes: 9 additions & 13 deletions crates/fj-math/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
43 changes: 13 additions & 30 deletions crates/fj-operations/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,35 +1,18 @@
[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]
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"
Loading