Skip to content

Commit

Permalink
Merge pull request #2104 from hannobraun/rust
Browse files Browse the repository at this point in the history
Upgrade to Rust 1.74.0
  • Loading branch information
hannobraun authored Nov 21, 2023
2 parents 9e9004c + eaa3b68 commit 9704e2d
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 15 deletions.
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ keywords = ["cad", "programmatic", "code-cad"]
categories = ["encoding", "mathematics", "rendering"]


[workspace.lints.rust]
missing_docs = "warn"


[workspace.dependencies.fj]
version = "0.47.0"
path = "crates/fj"
Expand Down
3 changes: 3 additions & 0 deletions crates/fj-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ license.workspace = true
keywords.workspace = true
categories.workspace = true

[lints]
workspace = true

[dependencies]
fj-interop.workspace = true
fj-math.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions crates/fj-core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@
//!
//! [Fornjot]: https://www.fornjot.app/
#![warn(missing_docs)]

pub mod algorithms;
pub mod geometry;
pub mod objects;
Expand Down
2 changes: 2 additions & 0 deletions crates/fj-export/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ license.workspace = true
keywords.workspace = true
categories.workspace = true

[lints]
workspace = true

[dependencies]
fj-interop.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions crates/fj-export/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
//!
//! [Fornjot]: https://www.fornjot.app/
#![warn(missing_docs)]

use std::{fs::File, path::Path};

use thiserror::Error;
Expand Down
3 changes: 3 additions & 0 deletions crates/fj-interop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ license.workspace = true
keywords.workspace = true
categories.workspace = true

[lints]
workspace = true

[dependencies]
fj-math.workspace = true
2 changes: 0 additions & 2 deletions crates/fj-interop/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
//!
//! [Fornjot]: https://www.fornjot.app/
#![warn(missing_docs)]

pub mod ext;
pub mod mesh;
pub mod model;
3 changes: 3 additions & 0 deletions crates/fj-math/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ license.workspace = true
keywords.workspace = true
categories.workspace = true

[lints]
workspace = true

[dependencies]
approx = "0.5.1"
decorum = "0.3.1"
Expand Down
2 changes: 0 additions & 2 deletions crates/fj-math/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
//! [nalgebra]: https://nalgebra.org/
//! [Parry]: https://www.parry.rs/
#![warn(missing_docs)]

mod aabb;
mod arc;
mod circle;
Expand Down
4 changes: 4 additions & 0 deletions crates/fj-viewer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ license.workspace = true
keywords.workspace = true
categories.workspace = true

[lints]
workspace = true


[dependencies]
fj-interop.workspace = true
fj-math.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions crates/fj-viewer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
//!
//! [Fornjot]: https://www.fornjot.app/
#![warn(missing_docs)]

mod assets;
mod camera;
mod graphics;
Expand Down
3 changes: 3 additions & 0 deletions crates/fj-window/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ license.workspace = true
keywords.workspace = true
categories.workspace = true

[lints]
workspace = true


[dependencies]
fj-interop.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions crates/fj-window/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
//!
//! [Fornjot]: https://www.fornjot.app/
#![warn(missing_docs)]

mod display;
mod window;

Expand Down
3 changes: 3 additions & 0 deletions crates/fj/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ license.workspace = true
keywords.workspace = true
categories.workspace = true

[lints]
workspace = true


[dependencies]
fj-core.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions crates/fj/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
//!
//! [Fornjot]: https://www.fornjot.app/
#![warn(missing_docs)]

mod args;
mod handle_model;

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.73.0"
channel = "1.74.0"
components = ["rustfmt", "clippy"]
targets = [
"aarch64-apple-ios",
Expand Down

0 comments on commit 9704e2d

Please sign in to comment.