Merge branch 'master' into 'master'
use raw identifier syntax for mod 'async' as it is a keyword since 2018 edition See merge request redox-os/termion!180
This commit is contained in:
commit
e2f8451008
|
@ -26,8 +26,8 @@ pub use sys::size::terminal_size;
|
||||||
pub use sys::size::terminal_size_pixels;
|
pub use sys::size::terminal_size_pixels;
|
||||||
pub use sys::tty::{is_tty, get_tty};
|
pub use sys::tty::{is_tty, get_tty};
|
||||||
|
|
||||||
mod async;
|
mod r#async;
|
||||||
pub use async::{AsyncReader, async_stdin};
|
pub use r#async::{AsyncReader, async_stdin};
|
||||||
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
mod macros;
|
mod macros;
|
||||||
|
|
Loading…
Reference in New Issue