bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Test fixes and rebase conflicts

Browse source
This commit is contained in:
Alex Crichton 2014-11-06 13:54:32 -08:00
parent 03006c7300
commit 65805bffe7
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/rand/os.rs
View file

@ -22,7 +22,7 @@ mod imp {
use rand::Rng; use rand::Rng;
use rand::reader::ReaderRng; use rand::reader::ReaderRng;
use result::{Ok, Err}; use result::{Ok, Err};
use slice::{ImmutableSlice, MutableSlice}; use slice::SlicePrelude;
use mem; use mem;
use os::errno; use os::errno;

2
src/libunicode/tables.rs
View file

@ -10,7 +10,7 @@
// NOTE: The following code was generated by "src/etc/unicode.py", do not edit directly // NOTE: The following code was generated by "src/etc/unicode.py", do not edit directly
#![allow(missing_docs, non_uppercase_globals, non_snake_case)] #![allow(missing_docs, non_upper_case_globals, non_snake_case)]
/// The version of [Unicode](http://www.unicode.org/) /// The version of [Unicode](http://www.unicode.org/)
/// that the `UnicodeChar` and `UnicodeStrPrelude` traits are based on. /// that the `UnicodeChar` and `UnicodeStrPrelude` traits are based on.