diff --git a/Cargo.toml b/Cargo.toml index 28bba3d4f..e9c108b32 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,8 +74,6 @@ default-members = [ 'tests/driver/interpreter', ] -resolver = "2" - [profile.release] lto = true panic = "abort" diff --git a/api/sixtyfps-rs/lib.rs b/api/sixtyfps-rs/lib.rs index ad3b501ce..7c9973da0 100644 --- a/api/sixtyfps-rs/lib.rs +++ b/api/sixtyfps-rs/lib.rs @@ -64,8 +64,7 @@ In your Cargo.toml add a `build` assignment and use the `sixtyfps-build` crate i [package] ... build = "build.rs" -resolver = "2" # avoid dependency conflicts on some platforms -edition = "2018" +edition = "2021" [dependencies] sixtyfps = "0.1.6" diff --git a/docs/tutorial/rust/src/getting_started.md b/docs/tutorial/rust/src/getting_started.md index a35b61fc0..80aa3b84d 100644 --- a/docs/tutorial/rust/src/getting_started.md +++ b/docs/tutorial/rust/src/getting_started.md @@ -15,15 +15,12 @@ Then we edit `Cargo.toml` to add the sixtyfps dependency: ```toml [package] #... -edition = "2018" -resolver = "2" +edition = "2021" [dependencies] sixtyfps = "0.1.6" ``` -The `resolver = "2"` line is there to avoid some errors because of conflicting dependencies on some platforms. - Finally we copy the hello world program from the [SixtyFPS documentation](https://sixtyfps.io/docs/rust/sixtyfps/) into our `src/main.rs`: ```rust,noplayground