Merge branch 'master' into conditional-style

This commit is contained in:
Filip Bachul 2023-08-16 09:39:47 +02:00
commit 4905720cbd
5 changed files with 31 additions and 22 deletions

View File

@ -41,7 +41,7 @@
"target/"
],
"plugins": [
"https://github.com/dprint/dprint-plugin-typescript/releases/download/0.85.1/plugin.wasm",
"https://github.com/dprint/dprint-plugin-typescript/releases/download/0.86.1/plugin.wasm",
"https://github.com/dprint/dprint-plugin-json/releases/download/0.17.4/plugin.wasm",
"https://github.com/dprint/dprint-plugin-markdown/releases/download/0.15.3/plugin.wasm",
"https://github.com/dprint/dprint-plugin-toml/releases/download/0.5.4/plugin.wasm"

View File

@ -7,4 +7,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: crate-ci/typos@v1.16.2
- uses: crate-ci/typos@v1.16.5

View File

@ -132,7 +132,7 @@ jobs:
run: cargo run --locked --features config-schema -- config-schema > .github/config-schema.json
- name: Check | Detect Changes
uses: reviewdog/action-suggester@v1.7.3
uses: reviewdog/action-suggester@v1.7.4
with:
tool_name: starship config-schema
filter_mode: nofilter

37
Cargo.lock generated
View File

@ -369,9 +369,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.3.19"
version = "4.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
dependencies = [
"clap_builder",
"clap_derive",
@ -380,9 +380,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.3.19"
version = "4.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
dependencies = [
"anstream",
"anstyle",
@ -1837,6 +1837,15 @@ dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "1.0.6"
@ -1940,9 +1949,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.19"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
[[package]]
name = "mac-notification-sys"
@ -2435,7 +2444,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
dependencies = [
"difflib",
"float-cmp",
"itertools",
"itertools 0.10.5",
"normalize-line-endings",
"predicates-core",
"regex",
@ -2783,9 +2792,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.104"
version = "1.0.105"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
dependencies = [
"itoa",
"ryu",
@ -3084,9 +3093,9 @@ dependencies = [
[[package]]
name = "tempfile"
version = "3.7.0"
version = "3.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
dependencies = [
"cfg-if",
"fastrand 2.0.0",
@ -3446,11 +3455,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "versions"
version = "5.0.0"
version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32feb3eb91e495efe5b6b2e3ca9d78db603043434a3a398a84b47de28abb2d02"
checksum = "c73a36bc44e3039f51fbee93e39f41225f6b17b380eb70cc2aab942df06b34dd"
dependencies = [
"itertools",
"itertools 0.11.0",
"nom 7.1.3",
]

View File

@ -43,7 +43,7 @@ gix-faster = ["gix-features/zlib-stock", "gix/fast-sha1"]
[dependencies]
chrono = { version = "0.4.26", default-features = false, features = ["clock", "std", "wasmbind"] }
clap = { version = "4.3.19", features = ["derive", "cargo", "unicode"] }
clap = { version = "4.3.21", features = ["derive", "cargo", "unicode"] }
clap_complete = "4.3.2"
dirs-next = "2.0.0"
dunce = "1.0.4"
@ -52,7 +52,7 @@ gethostname = "0.4.3"
gix = { version = "0.51.0", default-features = false, features = ["max-performance-safe"] }
gix-features = { version = "0.32.1", optional = true }
indexmap = { version = "1.9.3", features = ["serde"] }
log = { version = "0.4.19", features = ["std"] }
log = { version = "0.4.20", features = ["std"] }
# notify-rust is optional (on by default) because the crate doesn't currently build for darwin with nix
# see: https://github.com/NixOS/nixpkgs/issues/160876
notify-rust = { version = "4.8.0", optional = true }
@ -71,7 +71,7 @@ regex = { version = "1.9.3", default-features = false, features = ["perf", "std"
rust-ini = "0.19.0"
semver = "1.0.18"
serde = { version = "1.0.183", features = ["derive"] }
serde_json = "1.0.104"
serde_json = "1.0.105"
sha1 = "0.10.5"
shadow-rs = { version = "0.23.0", default-features = false }
# battery is optional (on by default) because the crate doesn't currently build for Termux
@ -85,7 +85,7 @@ toml_edit = "0.19.14"
unicode-segmentation = "1.10.1"
unicode-width = "0.1.10"
urlencoding = "2.1.3"
versions = "5.0.0"
versions = "5.0.1"
which = "4.4.0"
yaml-rust = "0.4.5"
@ -125,7 +125,7 @@ winres = "0.1.12"
[dev-dependencies]
mockall = "0.11"
tempfile = "3.7.0"
tempfile = "3.7.1"
[profile.release]
codegen-units = 1