Skip to content

Commit 74d7746

Browse files
committed
Fixed readme and removed some obsolete bits
1 parent bf50add commit 74d7746

File tree

5 files changed

+31
-86
lines changed

5 files changed

+31
-86
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ version = "0.1.0"
44
authors = ["Vladimir Matveev <[email protected]>"]
55

66
[[lib]]
7-
name = "rust-xml"
7+
name = "xml"
88
path = "src/lib.rs"

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ which allow to create a parser from string or a byte vector.
5555
over events:
5656

5757
```rust
58-
extern crate xml = "rust-xml";
58+
extern crate xml;
5959

6060
use std::io::File;
6161
use std::io::BufferedReader;

src/reader/config.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ impl ParserConfig {
5858
/// You can tweak this method using builder-like pattern:
5959
///
6060
/// ```rust
61+
/// use xml::reader::ParserConfig;
62+
///
6163
/// let config = ParserConfig.new()
6264
/// .trim_whitespace(true)
6365
/// .ignore_comments(true)

src/writer/event_emitter.rs

Lines changed: 0 additions & 71 deletions
This file was deleted.

src/writer/mod.rs

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,39 @@ impl EventWriter<MemWriter> {
6464
#[cfg(test)]
6565
mod tests {
6666
use std::io;
67-
use std::io::{File, BufferedReader};
67+
use std::io::{File, BufferedReader, MemWriter};
6868

6969
use reader::EventReader;
7070
use writer::EventWriter;
7171

72-
#[test]
72+
#[inline]
73+
fn reader_by_ref<R: Reader>(r: &mut R) -> io::RefReader<R> { r.by_ref() }
74+
75+
#[ignore]
7376
fn writer_test() {
74-
let f = File::open(&Path::new("data/sample_1.xml")).unwrap();
75-
let mut r = EventReader::new(BufferedReader::new(f));
76-
let mut w = EventWriter::new(io::stdout());
77-
78-
for e in r.events() {
79-
match e.as_writer_event() {
80-
Some(e) => match w.write(e) {
81-
Ok(_) => {},
82-
Err(e) => println!("Writer error: {}", e)
83-
},
84-
None => println!("Non-writer event: {}", e)
77+
let mut f = File::open(&Path::new("data/sample_1.xml")).unwrap();
78+
let mut b = MemWriter::new();
79+
80+
{
81+
let mut r = EventReader::new(BufferedReader::new(reader_by_ref(&mut f)));
82+
let mut w = EventWriter::new(b.by_ref());
83+
84+
for e in r.events() {
85+
match e.as_writer_event() {
86+
Some(e) => match w.write(e) {
87+
Ok(_) => {},
88+
Err(e) => fail!("Writer error: {}", e)
89+
},
90+
None => println!("Non-writer event: {}", e)
91+
}
8592
}
8693
}
94+
95+
f.seek(0, io::SeekSet);
96+
let fs = f.read_to_string().unwrap();
97+
98+
let bs = String::from_utf8(b.unwrap()).unwrap();
99+
100+
assert_eq!(fs, bs)
87101
}
88102
}

0 commit comments

Comments
 (0)