From 49a34da4e27487713c357a72dbb3ab9df71fb7b1 Mon Sep 17 00:00:00 2001
From: Dylan McKay <me@dylanmckay.io>
Date: Mon, 5 Nov 2018 23:37:50 +1300
Subject: [PATCH] Fixes from incorrect rebase

---
 src/lib.rs     | 4 ++--
 src/prelude.rs | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 7f0e0ce..92079e1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,13 +2,13 @@
 
 #![feature(asm)]
 #![feature(const_fn)]
-#![feature(associated_consts)]
 #![feature(associated_type_defaults)]
-#![feature(const_fn)]
 #![feature(lang_items)]
 #![feature(panic_handler)]
 #![feature(unwind_attributes)]
 
+#![no_std]
+
 pub use self::register::{Register, RegisterBits, RegisterValue};
 pub use self::pin::{DataDirection, Pin};
 
diff --git a/src/prelude.rs b/src/prelude.rs
index 5683120..a5e529e 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -1,6 +1,4 @@
 //! Re-exports commonly-used APIs that can be imported at once.
 
-use core::prelude::v1::*;
-
 pub use interrupt::without_interrupts;