From 6900fbfd9c575ffc31727eb0da06443ef9684cd7 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 23 Mar 2022 13:25:42 +0100
Subject: [PATCH] roezio: Switch to edition 2021
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
---
 Cargo.toml     |  1 +
 src/lib.rs     | 11 ++---------
 src/theming.rs |  2 ++
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index fa1271f2..89c2c548 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "poezio"
 version = "0.1.0"
+edition = "2021"
 authors = [
   "Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>",
   "Maxime “pep” Buquet <pep@bouah.net>",
diff --git a/src/lib.rs b/src/lib.rs
index 78ced5a8..5eed1395 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,13 +1,6 @@
-extern crate ncurses;
-extern crate nom;
-extern crate pyo3;
-#[macro_use]
-extern crate lazy_static;
-extern crate enum_set;
+mod theming;
 
-pub mod theming;
-
-use self::theming::{curses_attr, parse_attrs};
+use crate::theming::{curses_attr, parse_attrs};
 
 use pyo3::{
     conversion::{IntoPy, ToPyObject},
diff --git a/src/theming.rs b/src/theming.rs
index 9d6c901e..198546a5 100644
--- a/src/theming.rs
+++ b/src/theming.rs
@@ -13,6 +13,8 @@ use std::collections::HashMap;
 use std::mem;
 use std::sync::Mutex;
 
+use lazy_static::lazy_static;
+
 #[derive(Debug, PartialEq, Clone, Copy)]
 #[repr(u32)]
 pub enum Attr {