From 23cf17865ded73c4aeb200ffffe8a66942af8039 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Thu, 11 Aug 2016 01:34:53 +0000
Subject: [PATCH] Remove workaround for rust-lang/rust#25544.

---
 src/arch/mod.rs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/arch/mod.rs b/src/arch/mod.rs
index 3d7fe4e..a5420e3 100644
--- a/src/arch/mod.rs
+++ b/src/arch/mod.rs
@@ -2,17 +2,10 @@
 // Copyright (c) edef <edef@edef.eu>,
 //               whitequark <whitequark@whitequark.org>
 // See the LICENSE file included in this distribution.
+
 pub use self::imp::*;
 
-// rust-lang/rust#25544
-// #[cfg_attr(target_arch = "x86",    path = "x86.rs")]
-// #[cfg_attr(target_arch = "x86_64", path = "x86_64.rs")]
-// mod imp;
-
-#[cfg(target_arch = "x86")]
-#[path = "x86.rs"]
-mod imp;
-
-#[cfg(target_arch = "x86_64")]
-#[path = "x86_64.rs"]
+#[allow(unused_attributes)] // rust-lang/rust#35584
+#[cfg_attr(target_arch = "x86",    path = "x86.rs")]
+#[cfg_attr(target_arch = "x86_64", path = "x86_64.rs")]
 mod imp;