From 0b6174ace6156ee0c8e802cc1f8e2df681bb235e Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Mon, 18 Jun 2018 21:17:42 +0200
Subject: [PATCH] Use same import structure as in post

---
 src/gdt.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/gdt.rs b/src/gdt.rs
index 5a2f22b5..3274c405 100644
--- a/src/gdt.rs
+++ b/src/gdt.rs
@@ -1,10 +1,6 @@
-use x86_64::{
-    VirtAddr,
-    structures::gdt::{GlobalDescriptorTable, Descriptor, SegmentSelector},
-    structures::tss::TaskStateSegment,
-    instructions::segmentation::set_cs,
-    instructions::tables::load_tss,
-};
+use x86_64::structures::gdt::{Descriptor, GlobalDescriptorTable, SegmentSelector};
+use x86_64::structures::tss::TaskStateSegment;
+use x86_64::VirtAddr;
 
 pub const DOUBLE_FAULT_IST_INDEX: u16 = 0;
 
@@ -36,6 +32,9 @@ struct Selectors {
 }
 
 pub fn init() {
+    use x86_64::instructions::segmentation::set_cs;
+    use x86_64::instructions::tables::load_tss;
+
     GDT.0.load();
     unsafe {
         set_cs(GDT.1.code_selector);