Skip to content

Commit 1454a5d

Browse files
committed
rebase
1 parent 74dd0e0 commit 1454a5d

4 files changed

Lines changed: 13 additions & 11 deletions

File tree

Cargo.lock

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

crates/tower-cmd/src/apps.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,11 +519,11 @@ fn should_notify_run_wait(already_notified: bool, elapsed: Duration) -> bool {
519519

520520
#[cfg(test)]
521521
mod tests {
522+
use super::is_run_finished;
522523
use super::{
523524
apps_cmd, is_run_started, next_backoff, should_emit_line, should_notify_run_wait,
524525
stream_logs_until_complete, LogFollowOutcome, FOLLOW_BACKOFF_INITIAL, FOLLOW_BACKOFF_MAX,
525526
};
526-
use super::is_run_finished;
527527
use tokio::sync::{mpsc, oneshot};
528528
use tokio::time::Duration;
529529
use tower_api::models::run::Status;
@@ -613,12 +613,18 @@ mod tests {
613613

614614
#[test]
615615
fn test_run_wait_notification_logic() {
616-
assert!(!should_notify_run_wait(true, super::RUN_START_MESSAGE_DELAY));
616+
assert!(!should_notify_run_wait(
617+
true,
618+
super::RUN_START_MESSAGE_DELAY
619+
));
617620
assert!(!should_notify_run_wait(
618621
false,
619622
super::RUN_START_MESSAGE_DELAY - Duration::from_millis(1)
620623
));
621-
assert!(should_notify_run_wait(false, super::RUN_START_MESSAGE_DELAY));
624+
assert!(should_notify_run_wait(
625+
false,
626+
super::RUN_START_MESSAGE_DELAY
627+
));
622628
}
623629

624630
#[tokio::test]

crates/tower-cmd/src/mcp.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -702,9 +702,7 @@ impl TowerService {
702702
}
703703
}
704704

705-
#[tool(
706-
description = "Read and parse Towerfile configuration. Optional: working_directory."
707-
)]
705+
#[tool(description = "Read and parse Towerfile configuration. Optional: working_directory.")]
708706
async fn tower_file_read(
709707
&self,
710708
Parameters(request): Parameters<EmptyRequest>,
@@ -778,9 +776,7 @@ impl TowerService {
778776
}
779777
}
780778

781-
#[tool(
782-
description = "Validate Towerfile configuration. Optional: working_directory."
783-
)]
779+
#[tool(description = "Validate Towerfile configuration. Optional: working_directory.")]
784780
async fn tower_file_validate(
785781
&self,
786782
Parameters(request): Parameters<EmptyRequest>,

crates/tower-runtime/src/subprocess.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl ExecutionBackend for SubprocessBackend {
8888

8989
let opts = StartOptions {
9090
ctx: spec.telemetry_ctx,
91-
package: Package::from_unpacked_path(unpacked_path).await,
91+
package: Package::from_unpacked_path(unpacked_path).await?,
9292
cwd: None, // LocalApp determines cwd from package
9393
environment: spec.environment,
9494
secrets: spec.secrets,

0 commit comments

Comments
 (0)