Skip to content

Upgrade Graphite to Rust 2021 edition; upgrade dependencies #387

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.

Sign up for GitHub

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

Merged
Keavon merged 5 commits into from
Nov 1, 2021
Merged

Upgrade Graphite to Rust 2021 edition; upgrade dependencies #387

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
077d49a
Upgrade Graphite to Rust 2021 edition; upgrade dependencies
Keavon Nov 1, 2021
03ba9c4
Fix CI
Keavon Nov 1, 2021
788c329
Move changes to the project Cargo.tomls
TrueDoctor Nov 1, 2021
2b202ef
Remove unnecessary 2021 edition upgrade tweak
Keavon Nov 1, 2021
c241a06
Show version number before and after updating rustc
Keavon Nov 1, 2021
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ jobs:
- name: 🚧 Install Node dependencies
run: cd frontend && npm install

- name: 🔼 Update Rust to latest stable
run: rustup update stable

- name: 📦 Install cargo-about
run: cargo install cargo-about

Expand Down
120 changes: 57 additions & 63 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion charcoal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[package]
name = "graphite-charcoal"
version = "0.1.0"
rust-version = "1.56.0"
authors = ["Graphite Authors <contact@graphite.design>"]
edition = "2018"
edition = "2021"
readme = "../README.md"
homepage = "https://www.graphite.design"
repository = "https://github.com/GraphiteEditor/Graphite"
Expand Down
3 changes: 2 additions & 1 deletion editor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[package]
name = "graphite-editor"
version = "0.1.0"
rust-version = "1.56.0"
authors = ["Graphite Authors <contact@graphite.design>"]
edition = "2018"
edition = "2021"
readme = "../README.md"
homepage = "https://www.graphite.design"
repository = "https://github.com/GraphiteEditor/Graphite"
Expand Down
2 changes: 1 addition & 1 deletion editor/src/document/document_file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
let scrollbar_size = viewport_size / bounds_length;

let log = root_layerdata.scale.log2();
let mut ruler_inverval = if log < 0. { 100. * 2_f64.powf(-log.ceil()) } else { 100. / 2_f64.powf(log.ceil()) };
let ruler_inverval = if log < 0. { 100. * 2_f64.powf(-log.ceil()) } else { 100. / 2_f64.powf(log.ceil()) };
let ruler_spacing = ruler_inverval * root_layerdata.scale;

let ruler_origin = self.graphene_document.root.transform.transform_point2(DVec2::ZERO);
Expand Down
6 changes: 2 additions & 4 deletions frontend/wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[package]
name = "graphite-wasm"
version = "0.1.0"
rust-version = "1.56.0"
authors = ["Graphite Authors <contact@graphite.design>"]
edition = "2018"
edition = "2021"
readme = "../../README.md"
homepage = "https://www.graphite.design"
repository = "https://github.com/GraphiteEditor/Graphite"
Expand All @@ -19,9 +20,6 @@ log = "0.4"
serde = { version = "1.0", features = ["derive"] }
wasm-bindgen = { version = "0.2.73", features = ["serde-serialize"] }

[profile.dev]
opt-level = 3

[dev-dependencies]
wasm-bindgen-test = "0.3.22"

Expand Down
3 changes: 2 additions & 1 deletion graphene/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[package]
name = "graphite-graphene"
version = "0.1.0"
rust-version = "1.56.0"
authors = ["Graphite Authors <contact@graphite.design>"]
edition = "2018"
edition = "2021"
readme = "../README.md"
homepage = "https://www.graphite.design"
repository = "https://github.com/GraphiteEditor/Graphite"
Expand Down
3 changes: 2 additions & 1 deletion proc-macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[package]
name = "graphite-proc-macros"
version = "0.1.0"
rust-version = "1.56.0"
authors = ["Graphite Authors <contact@graphite.design>"]
edition = "2018"
edition = "2021"
readme = "../README.md"
homepage = "https://www.graphite.design"
repository = "https://github.com/GraphiteEditor/Graphite"
Expand Down
Loading