andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-25 02:46:17 +04:00
Code Issues Projects Releases Wiki Activity

Fix compatibility with toml 0.6.0

Browse Source 
`toml::from_slice` has been removed. The CHANGELOG recommends using
`toml::from_str` instead and doing the byte-to-str conversion yourself.

The `toml::toml!` macro has also changed to return the type of the
value declared within the macro body. In the change in
`helix-view/src/theme.rs` this is a `toml::map::Map` (it was a
`toml::Value` previously) allowing us to skip the match and use the
map directly.

Co-authored-by: Pascal Kuthe <pascal.kuthe@semimod.de>
This commit is contained in:
Michael Davis 2023-01-24 11:11:07 -06:00
parent 52d854fa62
commit b3e9f6233a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helix-core/tests/indent.rs
View File

@ -28,8 +28,8 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
let mut config_file = test_dir; let mut config_file = test_dir;
config_file.push("languages.toml"); config_file.push("languages.toml");
let config = std::fs::read(config_file).unwrap(); let config = std::fs::read_to_string(config_file).unwrap();
let config = toml::from_slice(&config).unwrap(); let config = toml::from_str(&config).unwrap();
let loader = Loader::new(config); let loader = Loader::new(config);
// set runtime path so we can find the queries // set runtime path so we can find the queries

6
helix-view/src/theme.rs
View File

@ -517,10 +517,8 @@ fn test_parse_style_table() {
let mut style = Style::default(); let mut style = Style::default();
let palette = ThemePalette::default(); let palette = ThemePalette::default();
if let Value::Table(entries) = table { for (_name, value) in table {
for (_name, value) in entries { palette.parse_style(&mut style, value).unwrap();
palette.parse_style(&mut style, value).unwrap();
}
} }
assert_eq!( assert_eq!(