diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-10 19:02:41 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-10 19:02:57 -0700 |
| commit | 1a8a0a77b14c44d98501cd9fb0f14ed88d4c38d9 (patch) | |
| tree | 420e9a1642cc6265bee4490f5fd6404b0d709599 /src/libsyntax | |
| parent | f8b3eaae820f87a5d51fe382aef5e9f8256beb29 (diff) | |
| download | rust-1a8a0a77b14c44d98501cd9fb0f14ed88d4c38d9.tar.gz rust-1a8a0a77b14c44d98501cd9fb0f14ed88d4c38d9.zip | |
Camel case std::serialization
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/ext/auto_serialize.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 364576aae33..3d3fd5bfd11 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1,8 +1,8 @@ // The Rust abstract syntax tree. use codemap::{span, filename}; -use std::serialization::{serializer, - deserializer, +use std::serialization::{Serializer, + Deserializer, serialize_Option, deserialize_Option, serialize_uint, @@ -38,7 +38,7 @@ macro_rules! interner_key ( (-3 as uint, 0u))) ) -fn serialize_ident<S: serializer>(s: S, i: ident) { +fn serialize_ident<S: Serializer>(s: S, i: ident) { let intr = match unsafe{task::local_data_get(interner_key!())}{ None => fail ~"serialization: TLS interner not set up", Some(intr) => intr @@ -46,7 +46,7 @@ fn serialize_ident<S: serializer>(s: S, i: ident) { s.emit_str(*(*intr).get(i)); } -fn deserialize_ident<D: deserializer>(d: D) -> ident { +fn deserialize_ident<D: Deserializer>(d: D) -> ident { let intr = match unsafe{task::local_data_get(interner_key!())}{ None => fail ~"deserialization: TLS interner not set up", Some(intr) => intr diff --git a/src/libsyntax/ext/auto_serialize.rs b/src/libsyntax/ext/auto_serialize.rs index 1dc8cee6ac9..1bb207adfc2 100644 --- a/src/libsyntax/ext/auto_serialize.rs +++ b/src/libsyntax/ext/auto_serialize.rs @@ -583,7 +583,7 @@ fn mk_ser_fn(cx: ext_ctxt, span: span, name: ast::ident, ast::bound_trait(cx.ty_path(span, ~[cx.ident_of(~"std"), cx.ident_of(~"serialization"), - cx.ident_of(~"serializer")], + cx.ident_of(~"Serializer")], ~[]))]; let ser_tps: ~[ast::ty_param] = @@ -789,7 +789,7 @@ fn mk_deser_fn(cx: ext_ctxt, span: span, ast::bound_trait(cx.ty_path( span, ~[cx.ident_of(~"std"), cx.ident_of(~"serialization"), - cx.ident_of(~"deserializer")], + cx.ident_of(~"Deserializer")], ~[]))]; let deser_tps: ~[ast::ty_param] = diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 6f756c946a4..5f1bdf2ff3e 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -1,8 +1,8 @@ use util::interner; use util::interner::interner; use std::map::{HashMap, str_hash}; -use std::serialization::{serializer, - deserializer, +use std::serialization::{Serializer, + Deserializer, serialize_uint, deserialize_uint, serialize_i64, |