Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace unmaintained yaml-rust with active fork #526

Closed
wants to merge 1 commit into from
Closed
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
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ exclude = [
]

[dependencies]
yaml-rust = { version = "0.4.5", optional = true }
yaml-rust2 = { version = "0.8.0", optional = true }
onig = { version = "6.0", optional = true, default-features = false }
fancy-regex = { version = "0.11", optional = true }
walkdir = "2.0"
Expand Down Expand Up @@ -69,7 +69,7 @@ html = ["parsing"]
# Support for parsing .tmTheme files and .tmPreferences files
plist-load = ["plist"]
# Support for parsing .sublime-syntax files
yaml-load = ["yaml-rust", "parsing"]
yaml-load = ["yaml-rust2", "parsing"]

default-onig = ["parsing", "default-syntaxes", "default-themes", "html", "plist-load", "yaml-load", "dump-load", "dump-create", "regex-onig"]
# In order to switch to the fancy-regex engine, disable default features then add the default-fancy feature
Expand Down
4 changes: 2 additions & 2 deletions src/parsing/yaml_load.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use super::regex::{Regex, Region};
use super::scope::*;
use super::syntax_definition::*;
use yaml_rust::{YamlLoader, Yaml, ScanError};
use yaml_rust::yaml::Hash;
use yaml_rust2::{YamlLoader, Yaml, ScanError};
use yaml_rust2::yaml::Hash;
use std::collections::HashMap;
use std::error::Error;
use std::path::Path;
Expand Down