on master help sign in
Fix compatibility with toml 0.6.0
b3e9f62Michael Davis
helix-core/tests/indent.rs+2−2
@@ -28,8 +28,8 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
28
28
29 let mut config_file = test_dir;
29 let mut config_file = test_dir;
30 config_file.push("languages.toml");
30 config_file.push("languages.toml");
31− let config = std::fs::read(config_file).unwrap();
31+ let config = std::fs::read_to_string(config_file).unwrap();
32− let config = toml::from_slice(&config).unwrap();
32+ let config = toml::from_str(&config).unwrap();
33 let loader = Loader::new(config);
33 let loader = Loader::new(config);
34
34
35 // set runtime path so we can find the queries
35 // set runtime path so we can find the queries
helix-view/src/theme.rs+2−4
@@ -517,10 +517,8 @@ mod tests {
517
517
518 let mut style = Style::default();
518 let mut style = Style::default();
519 let palette = ThemePalette::default();
519 let palette = ThemePalette::default();
520− if let Value::Table(entries) = table {
521− for (_name, value) in entries {
520+ for (_name, value) in table {
522− palette.parse_style(&mut style, value).unwrap();
521+ palette.parse_style(&mut style, value).unwrap();
523− }
524 }
522 }
525
523
526 assert_eq!(
524 assert_eq!(