From 790fd7c5d188a67f30fa2ec5a063cdf44bbbfc23 Mon Sep 17 00:00:00 2001
From: Valentin Tolmer <valentin@tolmer.fr>
Date: Sun, 14 Nov 2021 01:23:21 +0100
Subject: [PATCH] cargo: Update to 2021 edition

---
 app/Cargo.toml                    | 2 +-
 auth/Cargo.toml                   | 2 +-
 server/Cargo.toml                 | 2 +-
 server/src/infra/graphql/query.rs | 1 -
 server/src/infra/ldap_handler.rs  | 1 -
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/Cargo.toml b/app/Cargo.toml
index 316c9db..df2a51b 100644
--- a/app/Cargo.toml
+++ b/app/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lldap_app"
 version = "0.2.0"
 authors = ["Valentin Tolmer <valentin@tolmer.fr>", "Steve Barrau <steve.barrau@gmail.com>", "Thomas Wickham <mackwic@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1"
diff --git a/auth/Cargo.toml b/auth/Cargo.toml
index e7132d9..7fa7a5a 100644
--- a/auth/Cargo.toml
+++ b/auth/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lldap_auth"
 version = "0.2.0"
 authors = ["Valentin Tolmer <valentin@tolmer.fr>", "Steve Barrau <steve.barrau@gmail.com>", "Thomas Wickham <mackwic@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 default = ["opaque_server", "opaque_client"]
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 643baa7..5d419d8 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Valentin Tolmer <valentin@tolmer.fr>", "Steve Barrau <steve.barrau@gmail.com>", "Thomas Wickham <mackwic@gmail.com>"]
-edition = "2018"
+edition = "2021"
 name = "lldap"
 version = "0.2.0"
 
diff --git a/server/src/infra/graphql/query.rs b/server/src/infra/graphql/query.rs
index bf93d56..1de7520 100644
--- a/server/src/infra/graphql/query.rs
+++ b/server/src/infra/graphql/query.rs
@@ -1,7 +1,6 @@
 use crate::domain::handler::{BackendHandler, GroupId, GroupIdAndName};
 use juniper::{graphql_object, FieldResult, GraphQLInputObject};
 use serde::{Deserialize, Serialize};
-use std::convert::TryInto;
 
 type DomainRequestFilter = crate::domain::handler::RequestFilter;
 type DomainUser = crate::domain::handler::User;
diff --git a/server/src/infra/ldap_handler.rs b/server/src/infra/ldap_handler.rs
index 4cfe4d3..8e627e1 100644
--- a/server/src/infra/ldap_handler.rs
+++ b/server/src/infra/ldap_handler.rs
@@ -13,7 +13,6 @@ use ldap3_server::proto::{
     LdapResultCode, LdapSearchRequest, LdapSearchResultEntry, LdapSearchScope,
 };
 use log::{debug, warn};
-use std::convert::TryFrom;
 
 fn make_dn_pair<I>(mut iter: I) -> Result<(String, String)>
 where