We don't need the resolver=2 with edition 2021

This commit is contained in:
Olivier Goffart 2022-01-25 09:03:05 +01:00 committed by Olivier Goffart
parent a45dcc1f9a
commit e2ec76f9ef
3 changed files with 2 additions and 8 deletions

View file

@ -74,8 +74,6 @@ default-members = [
'tests/driver/interpreter', 'tests/driver/interpreter',
] ]
resolver = "2"
[profile.release] [profile.release]
lto = true lto = true
panic = "abort" panic = "abort"

View file

@ -64,8 +64,7 @@ In your Cargo.toml add a `build` assignment and use the `sixtyfps-build` crate i
[package] [package]
... ...
build = "build.rs" build = "build.rs"
resolver = "2" # avoid dependency conflicts on some platforms edition = "2021"
edition = "2018"
[dependencies] [dependencies]
sixtyfps = "0.1.6" sixtyfps = "0.1.6"

View file

@ -15,15 +15,12 @@ Then we edit `Cargo.toml` to add the sixtyfps dependency:
```toml ```toml
[package] [package]
#... #...
edition = "2018" edition = "2021"
resolver = "2"
[dependencies] [dependencies]
sixtyfps = "0.1.6" 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`: Finally we copy the hello world program from the [SixtyFPS documentation](https://sixtyfps.io/docs/rust/sixtyfps/) into our `src/main.rs`:
```rust,noplayground ```rust,noplayground