Skip to content
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

Update Rust edition to 2021. #2327

Merged
merged 1 commit into from
Jan 13, 2023
Merged

Update Rust edition to 2021. #2327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion docs/book_examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
[package]
name = "book_examples"
version = "0.1.0"
license = "Apache-2.0"
repository = "https://github.com/linebender/druid"
authors = ["Colin Rofls <[email protected]>"]
edition = "2018"
edition = "2021"
publish = false

[dependencies]
druid = { path = "../../druid", features = [ "im" ] }
Expand Down
2 changes: 1 addition & 1 deletion druid-shell/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description = "Platform abstracting application shell used for druid toolkit."
repository = "https://github.com/linebender/druid"
readme = "README.md"
categories = ["os::macos-apis", "os::windows-apis", "gui"]
edition = "2018"
edition = "2021"

[package.metadata.docs.rs]
rustdoc-args = ["--cfg", "docsrs"]
Expand Down
1 change: 0 additions & 1 deletion druid-shell/src/backend/web/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,6 @@ impl WindowHandle {
}

pub fn request_timer(&self, deadline: Instant) -> TimerToken {
use std::convert::TryFrom;
let interval = deadline.duration_since(Instant::now()).as_millis();
let interval = match i32::try_from(interval) {
Ok(iv) => iv,
Expand Down
2 changes: 1 addition & 1 deletion druid/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = "https://github.com/linebender/druid"
categories = ["gui"]
readme = "README.md"
keywords = ["gui", "ui", "toolkit"]
edition = "2018"
edition = "2021"

[package.metadata.docs.rs]
# The "svg" and "image" features have doc clashes that cause undefined output in docs.
Expand Down
2 changes: 1 addition & 1 deletion druid/examples/hello_web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
license = "Apache-2.0"
description = "Minimal web example"
repository = "https://github.com/linebender/druid"
edition = "2018"
edition = "2021"
publish = false

[lib]
Expand Down
5 changes: 4 additions & 1 deletion druid/examples/value_formatting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
[package]
name = "value-formatting"
version = "0.1.0"
license = "Apache-2.0"
repository = "https://github.com/linebender/druid"
authors = ["Colin Rofls <[email protected]>"]
edition = "2018"
edition = "2021"
publish = false

[dependencies]
druid = { path = "../../" }
2 changes: 1 addition & 1 deletion druid/examples/web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
license = "Apache-2.0"
description = "Scaffolding for druid web examples"
repository = "https://github.com/linebender/druid"
edition = "2018"
edition = "2021"
publish = false

[lib]
Expand Down