Skip to content

Commit ef3e3bd

Browse files
David Tolnaymeta-codesync[bot]
authored andcommitted
Update shlex from 1.3.0 to 2.0.1
Summary: Release notes: https://github.com/comex/rust-shlex/blob/master/CHANGELOG.md Reviewed By: 8Keep Differential Revision: D116823414 fbshipit-source-id: c58a7a8325118b30b1218a503e3eaaef6e82e451
1 parent c091bba commit ef3e3bd

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

eden/fs/cli_rs/edenfs-client/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ sapling-http-client = { version = "0.1.0", path = "../../../scm/lib/http-client"
3434
sapling-thrift-types = { version = "0.1.0", path = "../../../scm/lib/thrift-types" }
3535
serde = { version = "1.0.229", features = ["derive", "rc"] }
3636
serde_json = { version = "1.0.151", features = ["alloc", "float_roundtrip", "raw_value", "unbounded_depth"] }
37-
shlex = "1.3"
37+
shlex = "2.0.1"
3838
strum = { version = "0.28.0", features = ["derive"] }
3939
subprocess = "0.2.15"
4040
sysinfo = "0.38.4"

eden/fs/cli_rs/edenfs-client/src/redirect.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ impl Redirection {
484484
format!(
485485
"Failed to execute command `{} {}`",
486486
APFS_HELPER,
487-
shlex::join(args.iter().copied())
487+
shlex::try_join(args.iter().copied()).unwrap(), // Unwrap OK, we know the args are valid
488488
)
489489
})?;
490490
if output.status.success() {
@@ -551,7 +551,7 @@ impl Redirection {
551551
.with_context(|| {
552552
format!(
553553
"Failed to execute command `hdiutil {}`",
554-
shlex::join(args.iter().copied())
554+
shlex::try_join(args.iter().copied()).unwrap(), // Unwrap OK, we know the args are valid
555555
)
556556
})?;
557557
if !create_output.status.success() {
@@ -589,7 +589,7 @@ impl Redirection {
589589
.with_context(|| {
590590
format!(
591591
"Failed to execute command `hdiutil {}`",
592-
shlex::join(args.iter().copied())
592+
shlex::try_join(args.iter().copied()).unwrap(), // Unwrap OK, we know the args are valid
593593
)
594594
})?;
595595
if !attach_output.status.success() {
@@ -713,7 +713,7 @@ impl Redirection {
713713
.with_context(|| {
714714
format!(
715715
"Failed to execute command `diskutil {}`",
716-
shlex::join(args.iter().copied())
716+
shlex::try_join(args.iter().copied()).unwrap(), // Unwrap OK, we know the args are valid
717717
)
718718
})?;
719719
if !output.status.success() {

eden/fs/cli_rs/edenfs-commands/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ tracing = { version = "0.1.41", features = ["attributes", "valuable"] }
5151
tempfile = "3.27.0"
5252

5353
[target.'cfg(target_os = "linux")'.dependencies]
54-
shlex = "1.3"
54+
shlex = "2.0.1"
5555

5656
[target.'cfg(target_os = "macos")'.dependencies]
5757
glob = "0.3.4"
58-
shlex = "1.3"
58+
shlex = "2.0.1"

eden/fs/cli_rs/edenfs-commands/src/redirect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ impl RedirectCmd {
568568
format!(
569569
"Failed to execute apfs_helper cmd: `{} {}`.",
570570
APFS_HELPER,
571-
shlex::join(args.iter().copied()),
571+
shlex::try_join(args.iter().copied()).unwrap(), // Unwrap OK, we know the args are valid
572572
)
573573
})?;
574574
if !output.status.success() {

eden/scm/lib/cliparser/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ anyhow = "1.0.104"
1414
cpython = { version = "0.7.2", features = ["python3-sys"], optional = true, default-features = false }
1515
indexmap = { version = "2.14.0", features = ["arbitrary", "rayon", "serde"] }
1616
serde = { version = "1.0.229", features = ["derive", "rc"] }
17-
shlex = "1.3"
17+
shlex = "2.0.1"
1818
thiserror = "2.0.20"
1919

2020
[features]

eden/scm/lib/cliparser/src/alias.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub fn expand_aliases<S: ToString>(
5757
args = if let Some(suffix) = alias.strip_prefix('!') {
5858
// Alias starting with "!" is "shell alias". It is a string that should
5959
// be passed "as-is" to the shell (after $1/$2/$@ substitutions).
60-
// Round-trip through shlex::split and shlex::quote is not lossless.
60+
// Round-trip through shlex::split and shlex::try_quote is not lossless.
6161
// Therefore use a different alias handling function that does not
6262
// use shlex::split.
6363
expand_shell_alias_args(&args, suffix)

eden/scm/lib/clone/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ sapling-repo = { version = "0.1.0", path = "../repo", features = ["wdir"] }
2727
sapling-types = { version = "0.1.0", path = "../types" }
2828
sapling-util = { version = "0.1.0", path = "../util" }
2929
serde = { version = "1.0.229", features = ["derive", "rc"] }
30-
shlex = "1.3"
30+
shlex = "2.0.1"
3131
thiserror = "2.0.20"
3232
toml = { version = "1.1.4", features = ["preserve_order"] }
3333
tracing = { version = "0.1.41", features = ["attributes", "valuable"] }

0 commit comments

Comments
 (0)