Fixes from incorrect rebase

This commit is contained in:
Dylan McKay 2018-11-05 23:37:50 +13:00
parent 3fbe33504a
commit 49a34da4e2
2 changed files with 2 additions and 4 deletions

View File

@ -2,13 +2,13 @@
#![feature(asm)] #![feature(asm)]
#![feature(const_fn)] #![feature(const_fn)]
#![feature(associated_consts)]
#![feature(associated_type_defaults)] #![feature(associated_type_defaults)]
#![feature(const_fn)]
#![feature(lang_items)] #![feature(lang_items)]
#![feature(panic_handler)] #![feature(panic_handler)]
#![feature(unwind_attributes)] #![feature(unwind_attributes)]
#![no_std]
pub use self::register::{Register, RegisterBits, RegisterValue}; pub use self::register::{Register, RegisterBits, RegisterValue};
pub use self::pin::{DataDirection, Pin}; pub use self::pin::{DataDirection, Pin};

View File

@ -1,6 +1,4 @@
//! Re-exports commonly-used APIs that can be imported at once. //! Re-exports commonly-used APIs that can be imported at once.
use core::prelude::v1::*;
pub use interrupt::without_interrupts; pub use interrupt::without_interrupts;