From a06b90322cb4b61a3a20e12ab3406cff809c586c Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Thu, 4 Oct 2012 13:47:24 -0700 Subject: Finish de-exporting std. Part of #3583. --- src/libstd/serialization.rs | 76 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'src/libstd/serialization.rs') diff --git a/src/libstd/serialization.rs b/src/libstd/serialization.rs index e9067bc6404..502dba0be05 100644 --- a/src/libstd/serialization.rs +++ b/src/libstd/serialization.rs @@ -4,7 +4,7 @@ Core serialization interfaces. */ -trait Serializer { +pub trait Serializer { // Primitive types: fn emit_nil(); fn emit_uint(v: uint); @@ -37,7 +37,7 @@ trait Serializer { fn emit_tup_elt(idx: uint, f: fn()); } -trait Deserializer { +pub trait Deserializer { // Primitive types: fn read_nil() -> (); @@ -81,7 +81,7 @@ trait Deserializer { // // In some cases, these should eventually be coded as traits. -fn emit_from_vec(&&s: S, &&v: ~[T], f: fn(&&x: T)) { +pub fn emit_from_vec(&&s: S, &&v: ~[T], f: fn(&&x: T)) { do s.emit_vec(vec::len(v)) { for vec::eachi(v) |i,e| { do s.emit_vec_elt(i) { @@ -91,7 +91,7 @@ fn emit_from_vec(&&s: S, &&v: ~[T], f: fn(&&x: T)) { } } -fn read_to_vec(&&d: D, f: fn() -> T) -> ~[T] { +pub fn read_to_vec(&&d: D, f: fn() -> T) -> ~[T] { do d.read_vec |len| { do vec::from_fn(len) |i| { d.read_vec_elt(i, || f()) @@ -99,7 +99,7 @@ fn read_to_vec(&&d: D, f: fn() -> T) -> ~[T] { } } -trait SerializerHelpers { +pub trait SerializerHelpers { fn emit_from_vec(&&v: ~[T], f: fn(&&x: T)); } @@ -109,7 +109,7 @@ impl S: SerializerHelpers { } } -trait DeserializerHelpers { +pub trait DeserializerHelpers { fn read_to_vec(f: fn() -> T) -> ~[T]; } @@ -119,127 +119,127 @@ impl D: DeserializerHelpers { } } -fn serialize_uint(&&s: S, v: uint) { +pub fn serialize_uint(&&s: S, v: uint) { s.emit_uint(v); } -fn deserialize_uint(&&d: D) -> uint { +pub fn deserialize_uint(&&d: D) -> uint { d.read_uint() } -fn serialize_u8(&&s: S, v: u8) { +pub fn serialize_u8(&&s: S, v: u8) { s.emit_u8(v); } -fn deserialize_u8(&&d: D) -> u8 { +pub fn deserialize_u8(&&d: D) -> u8 { d.read_u8() } -fn serialize_u16(&&s: S, v: u16) { +pub fn serialize_u16(&&s: S, v: u16) { s.emit_u16(v); } -fn deserialize_u16(&&d: D) -> u16 { +pub fn deserialize_u16(&&d: D) -> u16 { d.read_u16() } -fn serialize_u32(&&s: S, v: u32) { +pub fn serialize_u32(&&s: S, v: u32) { s.emit_u32(v); } -fn deserialize_u32(&&d: D) -> u32 { +pub fn deserialize_u32(&&d: D) -> u32 { d.read_u32() } -fn serialize_u64(&&s: S, v: u64) { +pub fn serialize_u64(&&s: S, v: u64) { s.emit_u64(v); } -fn deserialize_u64(&&d: D) -> u64 { +pub fn deserialize_u64(&&d: D) -> u64 { d.read_u64() } -fn serialize_int(&&s: S, v: int) { +pub fn serialize_int(&&s: S, v: int) { s.emit_int(v); } -fn deserialize_int(&&d: D) -> int { +pub fn deserialize_int(&&d: D) -> int { d.read_int() } -fn serialize_i8(&&s: S, v: i8) { +pub fn serialize_i8(&&s: S, v: i8) { s.emit_i8(v); } -fn deserialize_i8(&&d: D) -> i8 { +pub fn deserialize_i8(&&d: D) -> i8 { d.read_i8() } -fn serialize_i16(&&s: S, v: i16) { +pub fn serialize_i16(&&s: S, v: i16) { s.emit_i16(v); } -fn deserialize_i16(&&d: D) -> i16 { +pub fn deserialize_i16(&&d: D) -> i16 { d.read_i16() } -fn serialize_i32(&&s: S, v: i32) { +pub fn serialize_i32(&&s: S, v: i32) { s.emit_i32(v); } -fn deserialize_i32(&&d: D) -> i32 { +pub fn deserialize_i32(&&d: D) -> i32 { d.read_i32() } -fn serialize_i64(&&s: S, v: i64) { +pub fn serialize_i64(&&s: S, v: i64) { s.emit_i64(v); } -fn deserialize_i64(&&d: D) -> i64 { +pub fn deserialize_i64(&&d: D) -> i64 { d.read_i64() } -fn serialize_str(&&s: S, v: &str) { +pub fn serialize_str(&&s: S, v: &str) { s.emit_str(v); } -fn deserialize_str(&&d: D) -> ~str { +pub fn deserialize_str(&&d: D) -> ~str { d.read_str() } -fn serialize_float(&&s: S, v: float) { +pub fn serialize_float(&&s: S, v: float) { s.emit_float(v); } -fn deserialize_float(&&d: D) -> float { +pub fn deserialize_float(&&d: D) -> float { d.read_float() } -fn serialize_f32(&&s: S, v: f32) { +pub fn serialize_f32(&&s: S, v: f32) { s.emit_f32(v); } -fn deserialize_f32(&&d: D) -> f32 { +pub fn deserialize_f32(&&d: D) -> f32 { d.read_f32() } -fn serialize_f64(&&s: S, v: f64) { +pub fn serialize_f64(&&s: S, v: f64) { s.emit_f64(v); } -fn deserialize_f64(&&d: D) -> f64 { +pub fn deserialize_f64(&&d: D) -> f64 { d.read_f64() } -fn serialize_bool(&&s: S, v: bool) { +pub fn serialize_bool(&&s: S, v: bool) { s.emit_bool(v); } -fn deserialize_bool(&&d: D) -> bool { +pub fn deserialize_bool(&&d: D) -> bool { d.read_bool() } -fn serialize_Option(&&s: S, &&v: Option, st: fn(&&x: T)) { +pub fn serialize_Option(&&s: S, &&v: Option, st: fn(&&x: T)) { do s.emit_enum(~"option") { match v { None => do s.emit_enum_variant(~"none", 0u, 0u) { @@ -254,7 +254,7 @@ fn serialize_Option(&&s: S, &&v: Option, st: fn(&&x: T)) { } } -fn deserialize_Option(&&d: D, st: fn() -> T) +pub fn deserialize_Option(&&d: D, st: fn() -> T) -> Option { do d.read_enum(~"option") { do d.read_enum_variant |i| { -- cgit 1.4.1-3-g733a5 From f05bf26f859f9e373d5044048b8c937023497690 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Thu, 4 Oct 2012 14:08:59 -0700 Subject: Fix long line. --- src/libstd/serialization.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libstd/serialization.rs') diff --git a/src/libstd/serialization.rs b/src/libstd/serialization.rs index 502dba0be05..269027a80e5 100644 --- a/src/libstd/serialization.rs +++ b/src/libstd/serialization.rs @@ -239,7 +239,8 @@ pub fn deserialize_bool(&&d: D) -> bool { d.read_bool() } -pub fn serialize_Option(&&s: S, &&v: Option, st: fn(&&x: T)) { +pub fn serialize_Option(&&s: S, &&v: Option, + st: fn(&&x: T)) { do s.emit_enum(~"option") { match v { None => do s.emit_enum_variant(~"none", 0u, 0u) { -- cgit 1.4.1-3-g733a5 From e46e97fc9a6bb6485e87659ea968fac8c4d05a9f Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 5 Oct 2012 11:53:09 -0700 Subject: Silence most of the remaining warnings --- src/libcore/stackwalk.rs | 4 ++-- src/libstd/net_tcp.rs | 3 ++- src/libstd/serialization.rs | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/libstd/serialization.rs') diff --git a/src/libcore/stackwalk.rs b/src/libcore/stackwalk.rs index 09973148c8c..a88a44701ce 100644 --- a/src/libcore/stackwalk.rs +++ b/src/libcore/stackwalk.rs @@ -3,8 +3,8 @@ #[legacy_modes]; // tjc: remove after snapshot // NB: transitionary, de-mode-ing. -// XXX: Can't do this because frame_address needs a deprecated mode. -//#[forbid(deprecated_mode)]; +// XXX: Can't forbid this because frame_address needs a deprecated mode. +#[allow(deprecated_mode)]; #[forbid(deprecated_pattern)]; use cast::reinterpret_cast; diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs index 1027acfb569..249551fbb7d 100644 --- a/src/libstd/net_tcp.rs +++ b/src/libstd/net_tcp.rs @@ -1,5 +1,6 @@ //! High-level interface to libuv's TCP functionality -#[warn(deprecated_mode)]; +// XXX Need FFI fixes +#[allow(deprecated_mode)]; use ip = net_ip; use uv::iotask; diff --git a/src/libstd/serialization.rs b/src/libstd/serialization.rs index 269027a80e5..8ba00e65dec 100644 --- a/src/libstd/serialization.rs +++ b/src/libstd/serialization.rs @@ -1,5 +1,7 @@ //! Support code for serialization. +#[allow(deprecated_mode)]; + /* Core serialization interfaces. */ -- cgit 1.4.1-3-g733a5