build(deps): bump toml from 0.5.10 to 0.6.0

Bumps [toml](https://github.com/toml-rs/toml) from 0.5.10 to 0.6.0. - [Release notes](https://github.com/toml-rs/toml/releases) - [Commits](toml-rs/toml@toml-v0.5.10...toml-v0.6.0) --- updated-dependencies: - dependency-name: toml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Michael Davis <[email protected]>
helix-editor · Jan 24, 2023 · 8b0c916 · 8b0c916
1 parent e9dc9f4
commit 8b0c916
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml
@@ -36,7 +36,7 @@ hashbrown = { version = "0.13.2", features = ["raw"] }
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-toml = "0.5"
+toml = "0.6"
 
 imara-diff = "0.1.0"
 

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

diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml
@@ -16,7 +16,7 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1"
 serde = { version = "1.0", features = ["derive"] }
-toml = "0.5"
+toml = "0.6"
 etcetera = "0.4"
 tree-sitter = "0.20"
 once_cell = "1.17"

diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
@@ -61,7 +61,7 @@ pulldown-cmark = { version = "0.9", default-features = false }
 content_inspector = "0.2.4"
 
 # config
-toml = "0.5"
+toml = "0.6"
 
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
@@ -39,7 +39,7 @@ chardetng = "0.1"
 
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-toml = "0.5"
+toml = "0.6"
 log = "~0.4"
 
 which = "4.4"

diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
@@ -517,10 +517,8 @@ mod tests {
 
         let mut style = Style::default();
         let palette = ThemePalette::default();
-        if let Value::Table(entries) = table {
-            for (_name, value) in entries {
-                palette.parse_style(&mut style, value).unwrap();
-            }
+        for (_name, value) in table {
+            palette.parse_style(&mut style, value).unwrap();
         }
 
         assert_eq!(

diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -10,4 +10,4 @@ helix-term = { version = "0.6", path = "../helix-term" }
 helix-core = { version = "0.6", path = "../helix-core" }
 helix-view = { version = "0.6", path = "../helix-view" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
-toml = "0.5"
+toml = "0.6"