From e55527fee634b87a9a6e3b09a0533250d3709b60 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Thu, 14 May 2020 22:08:55 +0200
Subject: [PATCH] Merge, re-group imports in urlencoded

---
 src/urlencoded/ser.rs      | 11 +++++------
 src/urlencoded/ser/key.rs  |  7 ++++---
 src/urlencoded/ser/pair.rs | 15 +++++++--------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/urlencoded/ser.rs b/src/urlencoded/ser.rs
index e440ca25..874c6b08 100644
--- a/src/urlencoded/ser.rs
+++ b/src/urlencoded/ser.rs
@@ -5,13 +5,12 @@ mod pair;
 mod part;
 mod value;
 
+use std::{borrow::Cow, error, fmt, str};
+
 use serde::ser;
-use std::borrow::Cow;
-use std::error;
-use std::fmt;
-use std::str;
-use url::form_urlencoded::Serializer as UrlEncodedSerializer;
-use url::form_urlencoded::Target as UrlEncodedTarget;
+use url::form_urlencoded::{
+    Serializer as UrlEncodedSerializer, Target as UrlEncodedTarget,
+};
 
 /// Serializes a value into a `application/x-www-form-urlencoded` `String` buffer.
 ///
diff --git a/src/urlencoded/ser/key.rs b/src/urlencoded/ser/key.rs
index d2c8a92e..6f65ecb4 100644
--- a/src/urlencoded/ser/key.rs
+++ b/src/urlencoded/ser/key.rs
@@ -1,7 +1,8 @@
-use super::{part::Sink, Error};
+use std::{borrow::Cow, ops::Deref};
+
 use serde::Serialize;
-use std::borrow::Cow;
-use std::ops::Deref;
+
+use super::{part::Sink, Error};
 
 pub enum Key<'key> {
     Static(&'static str),
diff --git a/src/urlencoded/ser/pair.rs b/src/urlencoded/ser/pair.rs
index 01e3f82a..5e991968 100644
--- a/src/urlencoded/ser/pair.rs
+++ b/src/urlencoded/ser/pair.rs
@@ -1,12 +1,11 @@
-use super::key::KeySink;
-use super::part::PartSerializer;
-use super::value::ValueSink;
-use super::Error;
+use std::{borrow::Cow, mem};
+
 use serde::ser;
-use std::borrow::Cow;
-use std::mem;
-use url::form_urlencoded::Serializer as UrlEncodedSerializer;
-use url::form_urlencoded::Target as UrlEncodedTarget;
+use url::form_urlencoded::{
+    Serializer as UrlEncodedSerializer, Target as UrlEncodedTarget,
+};
+
+use super::{key::KeySink, part::PartSerializer, value::ValueSink, Error};
 
 pub struct PairSerializer<'input, 'target, Target: 'target + UrlEncodedTarget> {
     urlencoder: &'target mut UrlEncodedSerializer<'input, Target>,