diff options
| author | bors <bors@rust-lang.org> | 2013-08-30 17:20:36 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-30 17:20:36 -0700 |
| commit | 29449e355a68d2b878af1cdb65b97454e645206f (patch) | |
| tree | 572fe324fe4e789f0e017456069ec7570b6a53cb /src/libstd | |
| parent | 8002a09bf915bd186e4e455b25265b4160bfd125 (diff) | |
| parent | 9730ed9b027f17441faa90fce26350991a76b1d5 (diff) | |
| download | rust-29449e355a68d2b878af1cdb65b97454e645206f.tar.gz rust-29449e355a68d2b878af1cdb65b97454e645206f.zip | |
auto merge of #8889 : erickt/rust/cleanup, r=catamorphism
This fixes a couple minor things I've been sitting on. It cleans up some warnings, CapCases some types in librustc's rscope module, and adds a fixme.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fmt/parse.rs | 1 | ||||
| -rw-r--r-- | src/libstd/num/num.rs | 2 | ||||
| -rw-r--r-- | src/libstd/ptr.rs | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/fmt/parse.rs b/src/libstd/fmt/parse.rs index 6448896a489..4bfa6b5afce 100644 --- a/src/libstd/fmt/parse.rs +++ b/src/libstd/fmt/parse.rs @@ -595,7 +595,6 @@ impl<'self> Parser<'self> { mod tests { use super::*; use prelude::*; - use realstd::fmt::{String}; fn same(fmt: &'static str, p: ~[Piece<'static>]) { let mut parser = Parser::new(fmt); diff --git a/src/libstd/num/num.rs b/src/libstd/num/num.rs index 3cb110d8464..ac8f0022b95 100644 --- a/src/libstd/num/num.rs +++ b/src/libstd/num/num.rs @@ -285,6 +285,7 @@ pub trait Primitive: Num + Div<Self,Self> + Rem<Self,Self> { // FIXME (#5527): These should be associated constants + // FIXME (#8888): Removing `unused_self` requires #8888 to be fixed. fn bits(unused_self: Option<Self>) -> uint; fn bytes(unused_self: Option<Self>) -> uint; } @@ -327,6 +328,7 @@ pub trait Float: Real fn is_normal(&self) -> bool; fn classify(&self) -> FPCategory; + // FIXME (#8888): Removing `unused_self` requires #8888 to be fixed. fn mantissa_digits(unused_self: Option<Self>) -> uint; fn digits(unused_self: Option<Self>) -> uint; fn epsilon() -> Self; diff --git a/src/libstd/ptr.rs b/src/libstd/ptr.rs index 02469527b7a..38d8a244895 100644 --- a/src/libstd/ptr.rs +++ b/src/libstd/ptr.rs @@ -12,6 +12,7 @@ use cast; use clone::Clone; +#[cfg(not(test))] use cmp::Equiv; use iterator::{range, Iterator}; use option::{Option, Some, None}; |