From 7461fb48313fbe2aeac407e65ab2666952a025d4 Mon Sep 17 00:00:00 2001
From: timvisee <tim@visee.me>
Date: Fri, 29 Dec 2023 18:53:29 +0100
Subject: [PATCH] Bump Rust to 2021 edition

---
 Cargo.toml             | 1 +
 src/arg_handler.rs     | 3 ---
 src/image_manager.rs   | 4 +---
 src/main.rs            | 4 ----
 src/painter/handle.rs  | 4 +---
 src/painter/painter.rs | 6 +++---
 src/pix/canvas.rs      | 8 ++++----
 src/pix/client.rs      | 9 +++------
 8 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4615ffc..ed365f3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "pixelpwnr"
 version = "0.1.0"
+edition = "2021"
 authors = ["Tim Visée <timvisee@gmail.com>"]
 license = "GPL-3.0"
 readme = "README.md"
diff --git a/src/arg_handler.rs b/src/arg_handler.rs
index 4795625..1fdaee0 100644
--- a/src/arg_handler.rs
+++ b/src/arg_handler.rs
@@ -1,6 +1,3 @@
-extern crate clap;
-extern crate num_cpus;
-
 use clap::Parser;
 
 #[derive(Parser)]
diff --git a/src/image_manager.rs b/src/image_manager.rs
index b405f56..c268ce6 100644
--- a/src/image_manager.rs
+++ b/src/image_manager.rs
@@ -3,12 +3,10 @@ use std::path::Path;
 use std::thread::sleep;
 use std::time::Duration;
 
-use image;
+use crate::pix::canvas::Canvas;
 use image::imageops::FilterType;
 use image::DynamicImage;
 
-use pix::canvas::Canvas;
-
 /// A manager that manages all images to print.
 pub struct ImageManager {
     images: Vec<DynamicImage>,
diff --git a/src/main.rs b/src/main.rs
index 4c57093..2cf3ea4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,3 @@
-extern crate clap;
-extern crate image;
-extern crate rayon;
-
 mod arg_handler;
 mod color;
 mod image_manager;
diff --git a/src/painter/handle.rs b/src/painter/handle.rs
index 1ebdbc2..1f345ae 100644
--- a/src/painter/handle.rs
+++ b/src/painter/handle.rs
@@ -1,11 +1,9 @@
-extern crate image;
-
 use std::sync::mpsc::Sender;
 use std::thread::JoinHandle;
 
 use image::DynamicImage;
 
-use rect::Rect;
+use crate::rect::Rect;
 
 /// A handle to a painter thread.
 ///
diff --git a/src/painter/painter.rs b/src/painter/painter.rs
index 6059696..a83f490 100644
--- a/src/painter/painter.rs
+++ b/src/painter/painter.rs
@@ -3,9 +3,9 @@ use std::sync::mpsc::Receiver;
 
 use image::{DynamicImage, Pixel};
 
-use color::Color;
-use pix::client::Client;
-use rect::Rect;
+use crate::color::Color;
+use crate::pix::client::Client;
+use crate::rect::Rect;
 
 /// A painter that paints on a pixelflut panel.
 pub struct Painter {
diff --git a/src/pix/canvas.rs b/src/pix/canvas.rs
index 6efd582..d15d497 100644
--- a/src/pix/canvas.rs
+++ b/src/pix/canvas.rs
@@ -5,10 +5,10 @@ use std::time::Duration;
 
 use image::DynamicImage;
 
-use painter::handle::Handle;
-use painter::painter::Painter;
-use pix::client::Client;
-use rect::Rect;
+use crate::painter::handle::Handle;
+use crate::painter::painter::Painter;
+use crate::pix::client::Client;
+use crate::rect::Rect;
 
 /// A pixflut instance
 pub struct Canvas {
diff --git a/src/pix/client.rs b/src/pix/client.rs
index 5107e9c..ba53ab2 100644
--- a/src/pix/client.rs
+++ b/src/pix/client.rs
@@ -1,14 +1,11 @@
-extern crate bufstream;
-extern crate regex;
-
 use std::io::prelude::*;
 use std::io::{Error, ErrorKind};
 use std::net::TcpStream;
 
-use self::bufstream::BufStream;
-use self::regex::Regex;
+use bufstream::BufStream;
+use regex::Regex;
 
-use color::Color;
+use crate::color::Color;
 
 // The default buffer size for reading the client stream.
 // - Big enough so we don't have to expand