diff options
| author | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2016-02-08 16:09:01 +0100 |
|---|---|---|
| committer | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2016-02-11 12:34:48 +0100 |
| commit | ccf48bcd4054ecb4e205a18b1ac582ef3ac3a905 (patch) | |
| tree | 6a8f3b5bf12f7540c2f31575a9b1a6a31cbac231 /src/libsyntax | |
| parent | 80bf9ae18a133571d694aa866b824dcaea875d32 (diff) | |
| download | rust-ccf48bcd4054ecb4e205a18b1ac582ef3ac3a905.tar.gz rust-ccf48bcd4054ecb4e205a18b1ac582ef3ac3a905.zip | |
[breaking-change] don't glob export ast::FloatTy variants
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 13 | ||||
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 36543bd35ca..a43874f9990 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -10,7 +10,6 @@ // The Rust abstract syntax tree. -pub use self::FloatTy::*; pub use self::ForeignItem_::*; pub use self::IntTy::*; pub use self::Item_::*; @@ -1509,8 +1508,8 @@ impl fmt::Display for UintTy { #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Copy)] pub enum FloatTy { - TyF32, - TyF64, + F32, + F64, } impl fmt::Debug for FloatTy { @@ -1528,15 +1527,15 @@ impl fmt::Display for FloatTy { impl FloatTy { pub fn ty_to_string(&self) -> &'static str { match *self { - TyF32 => "f32", - TyF64 => "f64", + FloatTy::F32 => "f32", + FloatTy::F64 => "f64", } } pub fn bit_width(&self) -> usize { match *self { - TyF32 => 32, - TyF64 => 64, + FloatTy::F32 => 32, + FloatTy::F64 => 64, } } } diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 9ad5dafbf8b..bbcb0c70ff4 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -452,8 +452,8 @@ fn filtered_float_lit(data: token::InternedString, suffix: Option<&str>, sd: &Handler, sp: Span) -> ast::Lit_ { debug!("filtered_float_lit: {}, {:?}", data, suffix); match suffix.as_ref().map(|s| &**s) { - Some("f32") => ast::LitFloat(data, ast::TyF32), - Some("f64") => ast::LitFloat(data, ast::TyF64), + Some("f32") => ast::LitFloat(data, ast::FloatTy::F32), + Some("f64") => ast::LitFloat(data, ast::FloatTy::F64), Some(suf) => { if suf.len() >= 2 && looks_like_width_suffix(&['f'], suf) { // if it looks like a width, lets try to be helpful. |