libstd: fix serialization no-implicit-copies warnings
This commit is contained in:
parent
007e47d710
commit
d8988fe220
3 changed files with 29 additions and 29 deletions
|
@ -284,7 +284,7 @@ impl writer {
|
||||||
self.wr_tagged_bytes(tag_id, &[v as u8]);
|
self.wr_tagged_bytes(tag_id, &[v as u8]);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn wr_tagged_str(tag_id: uint, v: ~str) {
|
fn wr_tagged_str(tag_id: uint, v: &str) {
|
||||||
str::byte_slice(v, |b| self.wr_tagged_bytes(tag_id, b));
|
str::byte_slice(v, |b| self.wr_tagged_bytes(tag_id, b));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -363,7 +363,7 @@ impl ebml::writer: serialization::serializer {
|
||||||
fn emit_f32(_v: f32) { fail ~"Unimplemented: serializing an f32"; }
|
fn emit_f32(_v: f32) { fail ~"Unimplemented: serializing an f32"; }
|
||||||
fn emit_float(_v: float) { fail ~"Unimplemented: serializing a float"; }
|
fn emit_float(_v: float) { fail ~"Unimplemented: serializing a float"; }
|
||||||
|
|
||||||
fn emit_str(v: ~str) { self.wr_tagged_str(es_str as uint, v) }
|
fn emit_str(v: &str) { self.wr_tagged_str(es_str as uint, v) }
|
||||||
|
|
||||||
fn emit_enum(name: ~str, f: fn()) {
|
fn emit_enum(name: ~str, f: fn()) {
|
||||||
self._emit_label(name);
|
self._emit_label(name);
|
||||||
|
@ -445,7 +445,7 @@ priv impl ebml_deserializer {
|
||||||
return r_doc;
|
return r_doc;
|
||||||
}
|
}
|
||||||
|
|
||||||
fn push_doc<T: copy>(d: ebml::doc, f: fn() -> T) -> T{
|
fn push_doc<T>(d: ebml::doc, f: fn() -> T) -> T{
|
||||||
let old_parent = self.parent;
|
let old_parent = self.parent;
|
||||||
let old_pos = self.pos;
|
let old_pos = self.pos;
|
||||||
self.parent = d;
|
self.parent = d;
|
||||||
|
@ -499,13 +499,13 @@ impl ebml_deserializer: serialization::deserializer {
|
||||||
fn read_str() -> ~str { ebml::doc_as_str(self.next_doc(es_str)) }
|
fn read_str() -> ~str { ebml::doc_as_str(self.next_doc(es_str)) }
|
||||||
|
|
||||||
// Compound types:
|
// Compound types:
|
||||||
fn read_enum<T:copy>(name: ~str, f: fn() -> T) -> T {
|
fn read_enum<T>(name: ~str, f: fn() -> T) -> T {
|
||||||
debug!{"read_enum(%s)", name};
|
debug!{"read_enum(%s)", name};
|
||||||
self._check_label(name);
|
self._check_label(name);
|
||||||
self.push_doc(self.next_doc(es_enum), f)
|
self.push_doc(self.next_doc(es_enum), f)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_enum_variant<T:copy>(f: fn(uint) -> T) -> T {
|
fn read_enum_variant<T>(f: fn(uint) -> T) -> T {
|
||||||
debug!{"read_enum_variant()"};
|
debug!{"read_enum_variant()"};
|
||||||
let idx = self._next_uint(es_enum_vid);
|
let idx = self._next_uint(es_enum_vid);
|
||||||
debug!{" idx=%u", idx};
|
debug!{" idx=%u", idx};
|
||||||
|
@ -514,12 +514,12 @@ impl ebml_deserializer: serialization::deserializer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_enum_variant_arg<T:copy>(idx: uint, f: fn() -> T) -> T {
|
fn read_enum_variant_arg<T>(idx: uint, f: fn() -> T) -> T {
|
||||||
debug!{"read_enum_variant_arg(idx=%u)", idx};
|
debug!{"read_enum_variant_arg(idx=%u)", idx};
|
||||||
f()
|
f()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_vec<T:copy>(f: fn(uint) -> T) -> T {
|
fn read_vec<T>(f: fn(uint) -> T) -> T {
|
||||||
debug!{"read_vec()"};
|
debug!{"read_vec()"};
|
||||||
do self.push_doc(self.next_doc(es_vec)) {
|
do self.push_doc(self.next_doc(es_vec)) {
|
||||||
let len = self._next_uint(es_vec_len);
|
let len = self._next_uint(es_vec_len);
|
||||||
|
@ -528,38 +528,38 @@ impl ebml_deserializer: serialization::deserializer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_vec_elt<T:copy>(idx: uint, f: fn() -> T) -> T {
|
fn read_vec_elt<T>(idx: uint, f: fn() -> T) -> T {
|
||||||
debug!{"read_vec_elt(idx=%u)", idx};
|
debug!{"read_vec_elt(idx=%u)", idx};
|
||||||
self.push_doc(self.next_doc(es_vec_elt), f)
|
self.push_doc(self.next_doc(es_vec_elt), f)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_box<T:copy>(f: fn() -> T) -> T {
|
fn read_box<T>(f: fn() -> T) -> T {
|
||||||
debug!{"read_box()"};
|
debug!{"read_box()"};
|
||||||
f()
|
f()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_uniq<T:copy>(f: fn() -> T) -> T {
|
fn read_uniq<T>(f: fn() -> T) -> T {
|
||||||
debug!{"read_uniq()"};
|
debug!{"read_uniq()"};
|
||||||
f()
|
f()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_rec<T:copy>(f: fn() -> T) -> T {
|
fn read_rec<T>(f: fn() -> T) -> T {
|
||||||
debug!{"read_rec()"};
|
debug!{"read_rec()"};
|
||||||
f()
|
f()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_rec_field<T:copy>(f_name: ~str, f_idx: uint, f: fn() -> T) -> T {
|
fn read_rec_field<T>(f_name: ~str, f_idx: uint, f: fn() -> T) -> T {
|
||||||
debug!{"read_rec_field(%s, idx=%u)", f_name, f_idx};
|
debug!{"read_rec_field(%s, idx=%u)", f_name, f_idx};
|
||||||
self._check_label(f_name);
|
self._check_label(f_name);
|
||||||
f()
|
f()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_tup<T:copy>(sz: uint, f: fn() -> T) -> T {
|
fn read_tup<T>(sz: uint, f: fn() -> T) -> T {
|
||||||
debug!{"read_tup(sz=%u)", sz};
|
debug!{"read_tup(sz=%u)", sz};
|
||||||
f()
|
f()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_tup_elt<T:copy>(idx: uint, f: fn() -> T) -> T {
|
fn read_tup_elt<T>(idx: uint, f: fn() -> T) -> T {
|
||||||
debug!{"read_tup_elt(idx=%u)", idx};
|
debug!{"read_tup_elt(idx=%u)", idx};
|
||||||
f()
|
f()
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ impl Writer: serializer {
|
||||||
self.write_str(fmt!{"%?_f32", v});
|
self.write_str(fmt!{"%?_f32", v});
|
||||||
}
|
}
|
||||||
|
|
||||||
fn emit_str(v: ~str) {
|
fn emit_str(v: &str) {
|
||||||
self.write_str(fmt!{"%?", v});
|
self.write_str(fmt!{"%?", v});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,4 +127,4 @@ impl Writer: serializer {
|
||||||
if idx > 0u { self.write_str(~", "); }
|
if idx > 0u { self.write_str(~", "); }
|
||||||
f();
|
f();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ trait serializer {
|
||||||
fn emit_float(v: float);
|
fn emit_float(v: float);
|
||||||
fn emit_f64(v: f64);
|
fn emit_f64(v: f64);
|
||||||
fn emit_f32(v: f32);
|
fn emit_f32(v: f32);
|
||||||
fn emit_str(v: ~str);
|
fn emit_str(v: &str);
|
||||||
|
|
||||||
// Compound types:
|
// Compound types:
|
||||||
fn emit_enum(name: ~str, f: fn());
|
fn emit_enum(name: ~str, f: fn());
|
||||||
|
@ -65,17 +65,17 @@ trait deserializer {
|
||||||
fn read_float() -> float;
|
fn read_float() -> float;
|
||||||
|
|
||||||
// Compound types:
|
// Compound types:
|
||||||
fn read_enum<T:copy>(name: ~str, f: fn() -> T) -> T;
|
fn read_enum<T>(name: ~str, f: fn() -> T) -> T;
|
||||||
fn read_enum_variant<T:copy>(f: fn(uint) -> T) -> T;
|
fn read_enum_variant<T>(f: fn(uint) -> T) -> T;
|
||||||
fn read_enum_variant_arg<T:copy>(idx: uint, f: fn() -> T) -> T;
|
fn read_enum_variant_arg<T>(idx: uint, f: fn() -> T) -> T;
|
||||||
fn read_vec<T:copy>(f: fn(uint) -> T) -> T;
|
fn read_vec<T>(f: fn(uint) -> T) -> T;
|
||||||
fn read_vec_elt<T:copy>(idx: uint, f: fn() -> T) -> T;
|
fn read_vec_elt<T>(idx: uint, f: fn() -> T) -> T;
|
||||||
fn read_box<T:copy>(f: fn() -> T) -> T;
|
fn read_box<T>(f: fn() -> T) -> T;
|
||||||
fn read_uniq<T:copy>(f: fn() -> T) -> T;
|
fn read_uniq<T>(f: fn() -> T) -> T;
|
||||||
fn read_rec<T:copy>(f: fn() -> T) -> T;
|
fn read_rec<T>(f: fn() -> T) -> T;
|
||||||
fn read_rec_field<T:copy>(f_name: ~str, f_idx: uint, f: fn() -> T) -> T;
|
fn read_rec_field<T>(f_name: ~str, f_idx: uint, f: fn() -> T) -> T;
|
||||||
fn read_tup<T:copy>(sz: uint, f: fn() -> T) -> T;
|
fn read_tup<T>(sz: uint, f: fn() -> T) -> T;
|
||||||
fn read_tup_elt<T:copy>(idx: uint, f: fn() -> T) -> T;
|
fn read_tup_elt<T>(idx: uint, f: fn() -> T) -> T;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ___________________________________________________________________________
|
// ___________________________________________________________________________
|
||||||
|
@ -201,7 +201,7 @@ fn deserialize_i64<D: deserializer>(d: D) -> i64 {
|
||||||
d.read_i64()
|
d.read_i64()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn serialize_str<S: serializer>(s: S, v: ~str) {
|
fn serialize_str<S: serializer>(s: S, v: &str) {
|
||||||
s.emit_str(v);
|
s.emit_str(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue