Merge branch 'mehcode:master' into master

.github/workflows/cron.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.3
 
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@master
@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.3
 
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@master

.github/workflows/gitlint.yml

@@ -6,7 +6,7 @@ jobs:
   commit-lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.0
+      - uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v4

.github/workflows/msrv.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.3
 
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@master
@@ -45,7 +45,7 @@ jobs:
           - nightly
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.3
 
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@master
@@ -77,7 +77,7 @@ jobs:
           - beta
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.3
 
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@master
@@ -99,7 +99,7 @@ jobs:
           - stable
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.3
 
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@master
@@ -122,7 +122,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.3
 
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@master

Cargo.toml

@@ -8,7 +8,7 @@ readme = "README.md"
 keywords = ["config", "configuration", "settings", "env", "environment"]
 authors = ["Ryan Leckey <leckey.ryan@gmail.com>"]
 categories = ["config"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [badges]
@@ -33,10 +33,10 @@ async-trait = { version = "0.1.50", optional = true }
 toml = { version = "0.7", optional = true }
 serde_json = { version = "1.0.2", optional = true }
 yaml-rust = { version = "0.4", optional = true }
-rust-ini = { version = "0.18", optional = true }
+rust-ini = { version = "0.19", optional = true }
 ron = { version = "0.8", optional = true }
 json5_rs = { version = "0.4", optional = true, package = "json5" }
-indexmap = { version = "1.7.0", features = ["serde-1"], optional = true}
+indexmap = { version = "2.0.0", features = ["serde"], optional = true }
 convert_case = { version = "0.6", optional = true }
 pathdiff = "0.2"
 
@@ -45,13 +45,13 @@ serde_derive = "1.0.8"
 float-cmp = "0.9"
 chrono = { version = "0.4", features = ["serde"] }
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "fs", "io-util", "time"]}
-warp = "=0.3.3"
+warp = "=0.3.5"
 futures = "0.3.15"
 reqwest = "0.11.10"
 
 serde = "1.0"
 glob = "0.3"
 lazy_static = "1"
-notify = "^5.0.0"
+notify = "^6.0.0"
 temp-env = "0.3.0"
 log = { version = "0.4", features = ["serde"] }

tests/file_ini.rs

@@ -61,7 +61,7 @@ fn test_error_parse() {
     assert_eq!(
         res.unwrap_err().to_string(),
         format!(
-            r#"2:0 expecting "[Some('='), Some(':')]" but found EOF. in {}"#,
+            r#"3:1 expecting "[Some('='), Some(':')]" but found EOF. in {}"#,
             path.display()
         )
     );

tests/legacy/file_ini.rs

@@ -59,7 +59,7 @@ fn test_error_parse() {
     assert_eq!(
         res.unwrap_err().to_string(),
         format!(
-            r#"2:0 expecting "[Some('='), Some(':')]" but found EOF. in {}"#,
+            r#"3:1 expecting "[Some('='), Some(':')]" but found EOF. in {}"#,
             path.display()
         )
     );