Explorar o código

feat(deps): pass from serde_yaml to serde_norway

MartinFillon hai 1 ano
pai
achega
8ba74c5796
Modificáronse 3 ficheiros con 24 adicións e 23 borrados
  1. 19 19
      Cargo.lock
  2. 2 1
      Cargo.toml
  3. 3 3
      src/options/config.rs

+ 19 - 19
Cargo.lock

@@ -431,7 +431,7 @@ dependencies = [
  "proc-mounts",
  "rayon",
  "serde",
- "serde_yaml",
+ "serde_norway",
  "terminal_size",
  "timeago",
  "trycmd",
@@ -577,9 +577,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1116,18 +1116,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1146,25 +1146,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde_spanned"
-version = "0.6.5"
+name = "serde_norway"
+version = "0.9.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "46ed7109f6112481319ad20539e5c4411125c0e8133502a35dc0f80d19d9beb5"
 dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
  "serde",
+ "unsafe-libyaml",
 ]
 
 [[package]]
-name = "serde_yaml"
-version = "0.9.29"
+name = "serde_spanned"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
- "indexmap",
- "itoa",
- "ryu",
  "serde",
- "unsafe-libyaml",
 ]
 
 [[package]]
@@ -1403,9 +1403,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "url"

+ 2 - 1
Cargo.toml

@@ -96,8 +96,9 @@ unicode-width = "0.1"
 zoneinfo_compiled = "0.5.1"
 ansi-width = "0.1.0"
 serde = { version = "1.0.193", features = ["derive"] }
-serde_yaml = "0.9.29"
 dirs = "5.0.1"
+serde_norway = "0.9"
+
 [dependencies.git2]
 version = "0.19"
 optional = true

+ 3 - 3
src/options/config.rs

@@ -2,7 +2,7 @@ use crate::theme::ThemeFileType as FileType;
 use crate::theme::*;
 use nu_ansi_term::{Color, Style};
 use serde::{Deserialize, Deserializer, Serialize};
-use serde_yaml;
+use serde_norway;
 use std::collections::HashMap;
 use std::path::PathBuf;
 
@@ -605,11 +605,11 @@ impl ThemeConfig {
             ConfigLoc::Default => {
                 let path = dirs::config_dir()?.join("eza").join("theme.yml");
                 let file = std::fs::File::open(path).ok()?;
-                serde_yaml::from_reader(&file).ok()
+                serde_norway::from_reader(&file).ok()
             }
             ConfigLoc::Env(path) => {
                 let file = std::fs::File::open(path).ok()?;
-                serde_yaml::from_reader(&file).ok()
+                serde_norway::from_reader(&file).ok()
             }
         };
         FromOverride::from(ui_styles_override, Some(UiStyles::default()))