Update Rust edition to 2021 🎉

hecrj · hecrj · commit adce9e042138 · 2022-02-09T17:57:44.000+07:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iced"
 version = "0.3.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "A cross-platform GUI library inspired by Elm"
 license = "MIT"
 repository = "https://github.com/iced-rs/iced"
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iced_core"
 version = "0.4.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "The essential concepts of Iced"
 license = "MIT"
 repository = "https://github.com/iced-rs/iced"
diff --git a/examples/bezier_tool/Cargo.toml b/examples/bezier_tool/Cargo.toml
@@ -2,7 +2,7 @@
 name = "bezier_tool"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/clock/Cargo.toml b/examples/clock/Cargo.toml
@@ -2,7 +2,7 @@
 name = "clock"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/color_palette/Cargo.toml b/examples/color_palette/Cargo.toml
@@ -2,7 +2,7 @@
 name = "color_palette"
 version = "0.1.0"
 authors = ["Clark Moody <clark@clarkmoody.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/component/Cargo.toml b/examples/component/Cargo.toml
@@ -2,7 +2,7 @@
 name = "component"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml
@@ -2,7 +2,7 @@
 name = "counter"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/custom_widget/Cargo.toml b/examples/custom_widget/Cargo.toml
@@ -2,7 +2,7 @@
 name = "custom_widget"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/download_progress/Cargo.toml b/examples/download_progress/Cargo.toml
@@ -2,7 +2,7 @@
 name = "download_progress"
 version = "0.1.0"
 authors = ["Songtronix <contact@songtronix.com>", "Folyd <lyshuhow@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/events/Cargo.toml b/examples/events/Cargo.toml
@@ -2,7 +2,7 @@
 name = "events"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/game_of_life/Cargo.toml b/examples/game_of_life/Cargo.toml
@@ -2,7 +2,7 @@
 name = "game_of_life"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/geometry/Cargo.toml b/examples/geometry/Cargo.toml
@@ -2,7 +2,7 @@
 name = "geometry"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/integration_opengl/Cargo.toml b/examples/integration_opengl/Cargo.toml
@@ -2,7 +2,7 @@
 name = "integration_opengl"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/integration_wgpu/Cargo.toml b/examples/integration_wgpu/Cargo.toml
@@ -2,7 +2,7 @@
 name = "integration_wgpu"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/pane_grid/Cargo.toml b/examples/pane_grid/Cargo.toml
@@ -2,7 +2,7 @@
 name = "pane_grid"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/pick_list/Cargo.toml b/examples/pick_list/Cargo.toml
@@ -2,7 +2,7 @@
 name = "pick_list"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/pokedex/Cargo.toml b/examples/pokedex/Cargo.toml
@@ -2,7 +2,7 @@
 name = "pokedex"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/progress_bar/Cargo.toml b/examples/progress_bar/Cargo.toml
@@ -2,7 +2,7 @@
 name = "progress_bar"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/qr_code/Cargo.toml b/examples/qr_code/Cargo.toml
@@ -2,7 +2,7 @@
 name = "qr_code"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/scrollable/Cargo.toml b/examples/scrollable/Cargo.toml
@@ -2,7 +2,7 @@
 name = "scrollable"
 version = "0.1.0"
 authors = ["Clark Moody <clark@clarkmoody.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/solar_system/Cargo.toml b/examples/solar_system/Cargo.toml
@@ -2,7 +2,7 @@
 name = "solar_system"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/stopwatch/Cargo.toml b/examples/stopwatch/Cargo.toml
@@ -2,7 +2,7 @@
 name = "stopwatch"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/styling/Cargo.toml b/examples/styling/Cargo.toml
@@ -2,7 +2,7 @@
 name = "styling"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/svg/Cargo.toml b/examples/svg/Cargo.toml
@@ -2,7 +2,7 @@
 name = "svg"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/todos/Cargo.toml b/examples/todos/Cargo.toml
@@ -2,7 +2,7 @@
 name = "todos"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/tooltip/Cargo.toml b/examples/tooltip/Cargo.toml
@@ -2,7 +2,7 @@
 name = "tooltip"
 version = "0.1.0"
 authors = ["Yusuf Bera Ertan <y.bera003.06@protonmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/tour/Cargo.toml b/examples/tour/Cargo.toml
@@ -2,7 +2,7 @@
 name = "tour"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/examples/url_handler/Cargo.toml b/examples/url_handler/Cargo.toml
@@ -2,9 +2,9 @@
 name = "url_handler"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
 iced = { path = "../.." }
-iced_native = { path = "../../native" }
+iced_native = { path = "../../native" }
diff --git a/examples/websocket/Cargo.toml b/examples/websocket/Cargo.toml
@@ -2,7 +2,7 @@
 name = "websocket"
 version = "0.1.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/futures/Cargo.toml b/futures/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iced_futures"
 version = "0.3.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "Commands, subscriptions, and runtimes for Iced"
 license = "MIT"
 repository = "https://github.com/iced-rs/iced"
diff --git a/glow/Cargo.toml b/glow/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iced_glow"
 version = "0.2.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "A glow renderer for iced"
 license = "MIT AND OFL-1.1"
 repository = "https://github.com/hecrj/iced"
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iced_glutin"
 version = "0.2.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "A glutin runtime for Iced"
 license = "MIT"
 repository = "https://github.com/iced-rs/iced"
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iced_graphics"
 version = "0.2.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "A bunch of backend-agnostic types that can be leveraged to build a renderer for Iced"
 license = "MIT"
 repository = "https://github.com/hecrj/iced"
diff --git a/native/Cargo.toml b/native/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iced_native"
 version = "0.4.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "A renderer-agnostic library for native GUIs"
 license = "MIT"
 repository = "https://github.com/iced-rs/iced"
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,2 +1,2 @@
 max_width=80
-edition="2018"
+edition="2021"
diff --git a/style/Cargo.toml b/style/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iced_style"
 version = "0.3.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "The default set of styles of Iced"
 license = "MIT"
 repository = "https://github.com/iced-rs/iced"
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iced_wgpu"
 version = "0.4.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "A wgpu renderer for Iced"
 license = "MIT AND OFL-1.1"
 repository = "https://github.com/iced-rs/iced"
diff --git a/wgpu/src/image/raster.rs b/wgpu/src/image/raster.rs
@@ -163,8 +163,6 @@ impl Operation {
     where
         R: std::io::BufRead + std::io::Seek,
     {
-        use std::convert::TryFrom;
-
         let exif = exif::Reader::new().read_from_container(reader)?;
 
         Ok(exif
diff --git a/winit/Cargo.toml b/winit/Cargo.toml
@@ -2,7 +2,7 @@
 name = "iced_winit"
 version = "0.3.0"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "A winit runtime for Iced"
 license = "MIT"
 repository = "https://github.com/hecrj/iced"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`max_width=80`
`2`		`-edition="2018"`
	`2`	`+edition="2021"`
Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,6 @@ impl Operation {`
`163`	`163`	`where`
`164`	`164`	`R: std::io::BufRead + std::io::Seek,`
`165`	`165`	`{`
`166`		`- use std::convert::TryFrom;`
`167`		`-`
`168`	`166`	`let exif = exif::Reader::new().read_from_container(reader)?;`
`169`	`167`
`170`	`168`	`Ok(exif`