Skip to content

Commit e3c1d0b

Browse files
Merge pull request #554 from 0rzech/yaml-rust2-dependency
Switch from yaml-rust to yaml-rust2 dependency
2 parents 4896caf + c477859 commit e3c1d0b

File tree

7 files changed

+71
-20
lines changed

7 files changed

+71
-20
lines changed

Cargo.lock

Lines changed: 64 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" }
1717
[features]
1818
default = ["toml", "json", "yaml", "ini", "ron", "json5", "convert-case", "async"]
1919
json = ["serde_json"]
20-
yaml = ["yaml-rust"]
20+
yaml = ["yaml-rust2"]
2121
ini = ["rust-ini"]
2222
json5 = ["json5_rs", "serde/derive"]
2323
convert-case = ["convert_case"]
@@ -32,7 +32,7 @@ nom = "7"
3232
async-trait = { version = "0.1", optional = true }
3333
toml = { version = "0.8", optional = true }
3434
serde_json = { version = "1.0", optional = true }
35-
yaml-rust = { version = "0.4", optional = true }
35+
yaml-rust2 = { version = "0.8", optional = true }
3636
rust-ini = { version = "0.20", optional = true }
3737
ron = { version = "0.8", optional = true }
3838
json5_rs = { version = "0.4", optional = true, package = "json5" }

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
[JSON]: https://github.com/serde-rs/json
2020
[TOML]: https://github.com/toml-lang/toml
21-
[YAML]: https://github.com/chyh1990/yaml-rust
21+
[YAML]: https://github.com/Ethiraric/yaml-rust2
2222
[INI]: https://github.com/zonyitoo/rust-ini
2323
[RON]: https://github.com/ron-rs/ron
2424
[JSON5]: https://github.com/callum-oakley/json5-rs

src/file/format/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub enum FileFormat {
4040
#[cfg(feature = "json")]
4141
Json,
4242

43-
/// YAML (parsed with yaml_rust)
43+
/// YAML (parsed with yaml_rust2)
4444
#[cfg(feature = "yaml")]
4545
Yaml,
4646

src/file/format/yaml.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::error::Error;
22
use std::fmt;
33
use std::mem;
44

5-
use yaml_rust as yaml;
5+
use yaml_rust2 as yaml;
66

77
use crate::format;
88
use crate::map::Map;

tests/file_yaml.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ fn test_error_parse() {
8585
assert_eq!(
8686
res.unwrap_err().to_string(),
8787
format!(
88-
"while parsing a block mapping, did not find expected key at \
89-
line 2 column 1 in {}",
88+
"simple key expect ':' at byte 21 line 3 column 1 in {}",
9089
path_with_extension.display()
9190
)
9291
);

tests/legacy/file_yaml.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ fn test_error_parse() {
8585
assert_eq!(
8686
res.unwrap_err().to_string(),
8787
format!(
88-
"while parsing a block mapping, did not find expected key at \
89-
line 2 column 1 in {}",
88+
"simple key expect ':' at byte 21 line 3 column 1 in {}",
9089
path_with_extension.display()
9190
)
9291
);

0 commit comments

Comments
 (0)