rollup merge of #20708: aturon/new-int-modules

Conflicts:
	src/libserialize/lib.rs
This commit is contained in:
Alex Crichton 2015-01-07 17:18:01 -08:00
commit dd38f46d71
35 changed files with 130 additions and 416 deletions

View file

@ -1783,9 +1783,8 @@ pub struct UnstableFileStat {
}
// NOTE(stage0): change this one last #[doc=..] to /// after the next snapshot
bitflags! {
#[doc = "A set of permissions for a file or directory is represented by a set of"]
/// A set of permissions for a file or directory is represented by a set of
/// flags which are or'd together.
flags FilePermission: u32 {
const USER_READ = 0o400,

View file

@ -395,13 +395,6 @@ impl Command {
}
}
#[cfg(stage0)]
impl fmt::Show for Command {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::String::fmt(self, f)
}
}
impl fmt::String for Command {
/// Format the program and arguments of a Command for display. Any
/// non-utf8 data is lossily converted using the utf8 replacement