Skip to content
This repository has been archived by the owner on Mar 25, 2024. It is now read-only.

bump yaml-rust to 0.4 #84

Merged
merged 1 commit into from
Nov 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ keywords = ["yaml", "serde"]
linked-hash-map = "0.5"
num-traits = "0.1.37"
serde = "1.0"
yaml-rust = { version = "0.3.5", features = ["preserve_order"] }
yaml-rust = "0.4"

[dev-dependencies]
serde_derive = "1.0"
Expand Down
8 changes: 4 additions & 4 deletions src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ pub struct Loader {
}

impl MarkedEventReceiver for Loader {
fn on_event(&mut self, event: &YamlEvent, marker: Marker) {
let event = match *event {
fn on_event(&mut self, event: YamlEvent, marker: Marker) {
let event = match event {
YamlEvent::Nothing | YamlEvent::StreamStart | YamlEvent::StreamEnd |
YamlEvent::DocumentStart | YamlEvent::DocumentEnd => return,

YamlEvent::Alias(id) => Event::Alias(id),
YamlEvent::Scalar(ref value, style, id, ref tag) => {
YamlEvent::Scalar(value, style, id, tag) => {
self.aliases.insert(id, self.events.len());
Event::Scalar(value.clone(), style, tag.clone())
Event::Scalar(value, style, tag)
}
YamlEvent::SequenceStart(id) => {
self.aliases.insert(id, self.events.len());
Expand Down
14 changes: 7 additions & 7 deletions tests/test_serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ fn test_nested_vec() {
let thing = vec![vec![1, 2, 3], vec![4, 5, 6]];
let yaml = unindent("
---
-
-
- 1
- 2
- 3
-
-
- 4
- 5
- 6");
Expand All @@ -148,7 +148,7 @@ fn test_nested_struct() {
let thing = Outer { inner: Inner { v: 512 } };
let yaml = unindent(r#"
---
inner:
inner:
v: 512"#);
test_serde(&thing, &yaml);
}
Expand Down Expand Up @@ -225,7 +225,7 @@ fn test_tuple_variant() {
let thing = Variant::Rgb(32, 64, 96);
let yaml = unindent(r#"
---
Rgb:
Rgb:
- 32
- 64
- 96"#);
Expand All @@ -245,7 +245,7 @@ fn test_struct_variant() {
};
let yaml = unindent(r#"
---
Color:
Color:
r: 32
g: 64
b: 96"#);
Expand Down Expand Up @@ -274,7 +274,7 @@ fn test_value() {
let yaml = unindent(r#"
---
type: primary
config:
config:
- ~
- true
- 65535
Expand All @@ -300,7 +300,7 @@ fn test_mapping() {

let yaml = unindent("
---
substructure:
substructure:
a: foo
b: bar");

Expand Down