Upgrade Graphite to Rust 2021 edition; upgrade dependencies (#387)

* Upgrade Graphite to Rust 2021 edition; upgrade dependencies

* Fix CI

* Move changes to the project Cargo.tomls

* Remove unnecessary 2021 edition upgrade tweak

* Show version number before and after updating rustc

Co-authored-by: Dennis Kobert <[email protected]>
# Conflicts:
#	Cargo.lock

Author: Keavon

.github/workflows/ci.yml

@@ -25,6 +25,9 @@ jobs:
     - name: 🚧 Install Node dependencies
       run: cd frontend && npm install
 
+    - name: 🔼 Update Rust to latest stable
+      run: rustc --version && rustup update stable && rustc --version
+
     - name: 📦 Install cargo-about
       run: cargo install cargo-about
 

Cargo.lock

@@ -1,8 +1,9 @@
 [package]
 name = "graphite-charcoal"
 version = "0.1.0"
+rust-version = "1.56.0"
 authors = ["Graphite Authors <[email protected]>"]
-edition = "2018"
+edition = "2021"
 readme = "../README.md"
 homepage = "https://www.graphite.design"
 repository = "https://github.com/GraphiteEditor/Graphite"

charcoal/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
 name = "graphite-editor"
 version = "0.1.0"
+rust-version = "1.56.0"
 authors = ["Graphite Authors <[email protected]>"]
-edition = "2018"
+edition = "2021"
 readme = "../README.md"
 homepage = "https://www.graphite.design"
 repository = "https://github.com/GraphiteEditor/Graphite"

editor/Cargo.toml

@@ -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);

editor/src/document/document_file.rs

@@ -1,8 +1,9 @@
 [package]
 name = "graphite-wasm"
 version = "0.1.0"
+rust-version = "1.56.0"
 authors = ["Graphite Authors <[email protected]>"]
-edition = "2018"
+edition = "2021"
 readme = "../../README.md"
 homepage = "https://www.graphite.design"
 repository = "https://github.com/GraphiteEditor/Graphite"
@@ -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"
 

frontend/wasm/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
 name = "graphite-graphene"
 version = "0.1.0"
+rust-version = "1.56.0"
 authors = ["Graphite Authors <[email protected]>"]
-edition = "2018"
+edition = "2021"
 readme = "../README.md"
 homepage = "https://www.graphite.design"
 repository = "https://github.com/GraphiteEditor/Graphite"

graphene/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
 name = "graphite-proc-macros"
 version = "0.1.0"
+rust-version = "1.56.0"
 authors = ["Graphite Authors <[email protected]>"]
-edition = "2018"
+edition = "2021"
 readme = "../README.md"
 homepage = "https://www.graphite.design"
 repository = "https://github.com/GraphiteEditor/Graphite"