Skip to content

Commit 919d074

Browse files
committed
Automated fixes to follow Rust development
Applied fixes: *attribute fix (cf rust-lang/rust#2569) *New vec library (cf rust-lang/rust#12771) *priv attribute removal (cf rust-lang/rust@f2a5c7a)
1 parent 733a5f3 commit 919d074

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/examples/value/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#[feature(phase)];
1+
#![feature(phase)]
22

33
#[phase(syntax, link)] extern crate log;
44
extern crate msgpack = "msgpack#0.1";

src/msgpack/lib.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#[crate_id = "msgpack#0.1"];
2-
#[comment = "msgpack.org implementation for Rust"];
3-
#[license = "MIT/ASL2"];
4-
#[crate_type = "lib"];
5-
#[feature(struct_variant)];
6-
#[allow(unused_must_use, dead_code)];
1+
#![crate_id = "msgpack#0.1"]
2+
#![comment = "msgpack.org implementation for Rust"]
3+
#![license = "MIT/ASL2"]
4+
#![crate_type = "lib"]
5+
#![feature(struct_variant)]
6+
#![allow(unused_must_use, dead_code)]
77

88
extern crate serialize = "serialize#0.10-pre";
99

@@ -43,8 +43,8 @@ fn read_double(rd: &mut io::Reader) -> f64 {
4343

4444
/// A structure to decode Msgpack from a reader.
4545
pub struct Decoder<'a> {
46-
priv rd: &'a mut io::Reader,
47-
priv next_byte: Option<u8>
46+
rd: &'a mut io::Reader,
47+
next_byte: Option<u8>
4848
}
4949

5050
impl<'a> Decoder<'a> {
@@ -141,11 +141,11 @@ impl<'a> Decoder<'a> {
141141
}
142142

143143
fn decode_array(&mut self, len: uint) -> Value {
144-
Array(vec::from_fn(len, |_| { self.decode_value() }))
144+
Array(Vec::from_fn(len, |_| { self.decode_value() }))
145145
}
146146

147147
fn decode_map(&mut self, len: uint) -> Value {
148-
Map(vec::from_fn(len, |_| { (self.decode_value(), self.decode_value()) }))
148+
Map(Vec::from_fn(len, |_| { (self.decode_value(), self.decode_value()) }))
149149
}
150150

151151
fn decode_ext(&mut self, len: uint) -> Value {
@@ -407,7 +407,7 @@ impl<'a> serialize::Decodable<Decoder<'a>> for Value {
407407

408408
/// A structure for implementing serialization to Msgpack.
409409
pub struct Encoder<'a> {
410-
priv wr: &'a mut io::Writer
410+
wr: &'a mut io::Writer
411411
}
412412

413413
impl<'a> Encoder<'a> {

0 commit comments

Comments
 (0)