Skip to content

Commit 8b333a8

Browse files
committed
Merge branch 'master' of github.com:remimimimi/uart_16550
2 parents a409545 + 7af942f commit 8b333a8

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "uart_16550"
3-
version = "0.2.13"
3+
version = "0.2.14"
44
authors = ["Lachlan Sneff <lachlan.sneff@gmail.com>", "Philipp Oppermann <dev@phil-opp.com>"]
55
description = "Minimal support for uart_16550 serial output."
66
license = "MIT"

Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Unreleased
22

3+
# 0.2.14 – 2021-05-14
4+
5+
- `SerialPort::new()` no longer requires `nightly` feature ([#16](https://github.com/rust-osdev/uart_16550/pull/16))
6+
37
# 0.2.13 – 2021-04-30
48

59
- Update x86_64 dependency and make it more robust ([#14](https://github.com/rust-osdev/uart_16550/pull/14))

src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ let data = serial_port.receive();
4343
#![warn(missing_docs)]
4444
#![cfg_attr(feature = "nightly", feature(const_ptr_offset))]
4545

46-
use bitflags::bitflags;
47-
4846
#[cfg(not(any(feature = "stable", feature = "nightly")))]
4947
compile_error!("Either the `stable` or `nightly` feature must be enabled");
5048

49+
use bitflags::bitflags;
50+
5151
macro_rules! wait_for {
5252
($cond:expr) => {
5353
while !$cond {
@@ -85,4 +85,4 @@ bitflags! {
8585
const OUTPUT_EMPTY = 1 << 5;
8686
// 6 and 7 unknown
8787
}
88-
}
88+
}

0 commit comments

Comments
 (0)