chore: support rust 1.59 again (#4278)

* chore: support rust 1.60 again

* bump shadow-rs
This commit is contained in:
David Knaack 2022-08-19 09:04:11 +02:00 committed by GitHub
parent 5984f0829e
commit 24c13e815e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 72 deletions

75
Cargo.lock generated
View File

@ -414,12 +414,6 @@ dependencies = [
"cache-padded", "cache-padded",
] ]
[[package]]
name = "const_fn"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
[[package]] [[package]]
name = "const_format" name = "const_format"
version = "0.2.25" version = "0.2.25"
@ -2032,16 +2026,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
dependencies = [ dependencies = [
"phf_shared 0.8.0", "phf_shared",
]
[[package]]
name = "phf"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
dependencies = [
"phf_shared 0.11.1",
] ]
[[package]] [[package]]
@ -2051,7 +2036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
dependencies = [ dependencies = [
"phf_generator", "phf_generator",
"phf_shared 0.8.0", "phf_shared",
] ]
[[package]] [[package]]
@ -2060,7 +2045,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
dependencies = [ dependencies = [
"phf_shared 0.8.0", "phf_shared",
"rand 0.7.3", "rand 0.7.3",
] ]
@ -2073,15 +2058,6 @@ dependencies = [
"siphasher", "siphasher",
] ]
[[package]]
name = "phf_shared"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
dependencies = [
"siphasher",
]
[[package]] [[package]]
name = "pin-project-lite" name = "pin-project-lite"
version = "0.2.9" version = "0.2.9"
@ -2599,14 +2575,13 @@ dependencies = [
[[package]] [[package]]
name = "shadow-rs" name = "shadow-rs"
version = "0.16.2" version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c786b1a738d4c628e9024ca491578a58a7be4594ea4fb67e0cb4c7ad297ae75" checksum = "8c0ea0c68418544f725eba5401a5b965a2263254c92458d04aeae74e9d88ff4e"
dependencies = [ dependencies = [
"const_format", "const_format",
"is_debug", "is_debug",
"time 0.3.11", "time 0.3.11",
"tzdb",
] ]
[[package]] [[package]]
@ -2857,7 +2832,7 @@ dependencies = [
"dirs 2.0.2", "dirs 2.0.2",
"fnv", "fnv",
"nom 5.1.2", "nom 5.1.2",
"phf 0.8.0", "phf",
"phf_codegen", "phf_codegen",
] ]
@ -3040,28 +3015,6 @@ version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
[[package]]
name = "tz-rs"
version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b3d23fda22515e0e3f4f903e159ad4fd32e37dc94d63522a091df70a247fbb0"
dependencies = [
"const_fn",
]
[[package]]
name = "tzdb"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa0c0ce33ad776d606b8109c19bb8b4917185f7b944af9103302f9c4c4fe36ac"
dependencies = [
"iana-time-zone",
"phf 0.11.1",
"phf_shared 0.11.1",
"tz-rs",
"utcnow",
]
[[package]] [[package]]
name = "ucd-trie" name = "ucd-trie"
version = "0.1.3" version = "0.1.3"
@ -3169,22 +3122,6 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821" checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821"
[[package]]
name = "utcnow"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe9835442f055fab72d40eb8e5164f2b98e70ebadedbf4506aac23ca7d623053"
dependencies = [
"const_fn",
"errno",
"js-sys",
"libc",
"rustix",
"wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
"winapi",
]
[[package]] [[package]]
name = "utf8-width" name = "utf8-width"
version = "0.1.6" version = "0.1.6"

View File

@ -66,7 +66,7 @@ semver = "1.0.13"
serde = { version = "1.0.143", features = ["derive"] } serde = { version = "1.0.143", features = ["derive"] }
serde_json = "1.0.83" serde_json = "1.0.83"
sha-1 = "0.10.0" sha-1 = "0.10.0"
shadow-rs = { version = "0.16.2", default-features = false } shadow-rs = { version = "0.16.3", default-features = false }
# battery is optional (on by default) because the crate doesn't currently build for Termux # battery is optional (on by default) because the crate doesn't currently build for Termux
# see: https://github.com/svartalf/rust-battery/issues/33 # see: https://github.com/svartalf/rust-battery/issues/33
starship-battery = { version = "0.7.9", optional = true } starship-battery = { version = "0.7.9", optional = true }
@ -110,7 +110,7 @@ features = [
nix = { version = "0.25.0", default-features = false, features = ["feature", "fs", "user"] } nix = { version = "0.25.0", default-features = false, features = ["feature", "fs", "user"] }
[build-dependencies] [build-dependencies]
shadow-rs = { version = "0.16.2", default-features = false } shadow-rs = { version = "0.16.3", default-features = false }
dunce = "1.0.2" dunce = "1.0.2"
[target.'cfg(windows)'.build-dependencies] [target.'cfg(windows)'.build-dependencies]

View File

@ -38,7 +38,8 @@ fn gen_presets_hook(mut file: &File) -> SdResult<()> {
format!( format!(
r#" r#"
"{name}" => {{ "{name}" => {{
let mut stdout = io::stdout().lock(); let stdout = io::stdout();
let mut stdout = stdout.lock();
let _ = stdout.write_all(include_bytes!(r"{full_path}")); let _ = stdout.write_all(include_bytes!(r"{full_path}"));
}} }}
"# "#