Skip to content

Commit 43d5979

Browse files
Replace unindent dependency with indoc's formatdoc! macro
Remove the unindent dependency and use the existing indoc dependency's formatdoc! macro instead, which provides the same functionality. Co-authored-by: Vlad Ivanov <vlad-ivanov-name@users.noreply.github.com>
1 parent f7d4448 commit 43d5979

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

josh-core/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@ serde_json = { workspace = true }
3535
serde_yaml = { workspace = true }
3636
sled = "0.34.7"
3737
tracing = { workspace = true }
38-
unindent = "0.2.3"

josh-core/src/history.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ pub fn unapply_filter(
402402
filtered_parent_ids.pop();
403403
}
404404
OrphansMode::Fail => {
405-
return Err(josh_error(&unindent::unindent(&format!(
405+
return Err(josh_error(&indoc::formatdoc!(
406406
r###"
407407
Rejecting new orphan branch at {:?} ({:?})
408408
Specify one of these options:
@@ -412,7 +412,7 @@ pub fn unapply_filter(
412412
"###,
413413
module_commit.summary().unwrap_or_default(),
414414
module_commit.id(),
415-
))));
415+
)));
416416
}
417417
}
418418
}

josh-proxy/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ tracing = { workspace = true }
4141
tracing-futures = "0.2.5"
4242
tracing-opentelemetry = "0.32.0"
4343
tracing-subscriber = { workspace = true }
44-
unindent = "0.2.3"
4544
url = "2.5.4"
4645
uuid = { version = "1.18.1", features = ["v4"] }
4746
josh-rpc = { path = "../josh-rpc" }

josh-proxy/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,14 @@ pub fn process_repo_update(repo_update: RepoUpdate) -> josh_core::JoshResult<Str
194194
"resolve_original_target"
195195
);
196196

197-
return Err(josh_core::josh_error(&unindent::unindent(&format!(
197+
return Err(josh_core::josh_error(&indoc::formatdoc!(
198198
r###"
199199
Reference {:?} does not exist on remote.
200200
If you want to create it, pass "-o base=<basebranch>" or "-o base=path/to/ref"
201201
to specify a base branch/reference.
202202
"###,
203203
baseref
204-
))));
204+
)));
205205
};
206206

207207
let reparent_orphans = if push_options.create {

0 commit comments

Comments
 (0)