Commit 64c8ee0d authored by eta's avatar eta
Browse files

Merge branch 'shellexpand' into 'main' 

Switch to shellexpand-fork version of shellexpand

See merge request !373
parents b27ffe14 72bb8e7f

Cargo.lock

+4 −4
Original line number Diff line number Diff line
@@ -2678,10 +2678,10 @@ dependencies = [ 
]



[[package]]

name = "shellexpand"

version = "2.1.0"

name = "shellexpand-fork"

version = "2.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "83bdb7831b2d85ddf4a7b148aa19d0587eddbe8671a436b7bd1182eaad0f2829"

checksum = "5b9b96d72c00ea377d8dfe6177badd0a6f42b4cb3122479ffe44fee2532d85ee"

dependencies = [

 "dirs-next",

]
@@ -3164,7 +3164,7 @@ dependencies = [ 
 "dirs",

 "once_cell",

 "serde",

 "shellexpand",

 "shellexpand-fork",

 "thiserror",

 "tor-error",

 "tracing",

crates/tor-config/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ thiserror = "1" 
derive_builder = "0.10"

once_cell = "1"

serde = { version = "1.0.103", features = ["derive"] }

shellexpand = { version = "2.1.0", optional = true }

shellexpand = { version = "2.1", package = "shellexpand-fork", optional = true }

tracing = "0.1.18"

directories = { version = "4", optional = true }