Skip to content

Commit

Permalink
Merge pull request #1 from willem66745/beta
Browse files Browse the repository at this point in the history
Rust 1.0.0-beta fixes
  • Loading branch information
dcuddeback committed Apr 13, 2015
2 parents 77a3323 + 82edf0a commit ee2c6d3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ repository = "https://github.com/dcuddeback/serial-rs.git"
[dependencies]
termios = "0.0.5"
libc = "0.1.5"
time = "0.1.24"
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#![feature(std_misc)]
extern crate time;

use std::io;

use std::default::Default;
use std::time::duration::Duration;
use time::Duration;

pub use BaudRate::*;
pub use CharSize::*;
Expand Down
3 changes: 2 additions & 1 deletion src/posix/poll.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#![allow(non_camel_case_types,dead_code)]

extern crate libc;
extern crate time;

use std::io;

use std::time::duration::Duration;
use time::Duration;

use self::libc::{c_int,c_short};

Expand Down
3 changes: 2 additions & 1 deletion src/posix/tty.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
extern crate libc;
extern crate termios;
extern crate time;

use std::io;

use std::default::Default;
use std::ffi::CString;
use std::path::Path;
use std::time::duration::Duration;
use time::Duration;

use std::os::unix::prelude::OsStrExt;

Expand Down

0 comments on commit ee2c6d3

Please sign in to comment.