Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ paste = "1.0.15"
pin-project-lite = "0.2.13"
proc-macro2 = "1.0"
proc-macro-error = "1"
progenitor = "0.15.1"
progenitor-client = "0.15.1"
progenitor = "0.16.0"
progenitor-client = "0.16.0"
proptest = "1.5.0"
quote = "1.0"
rand = "0.9.1"
Expand Down
4 changes: 2 additions & 2 deletions bin/propolis-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ async fn main() -> anyhow::Result<()> {
let log = create_logger(&opt);

let addr = SocketAddr::new(opt.server, opt.port);
let client = Client::new(&format!("http://{addr}"));
let client = Client::new(&format!("http://{addr}"))?;

match opt.cmd {
Command::New {
Expand Down Expand Up @@ -964,7 +964,7 @@ async fn main() -> anyhow::Result<()> {
}
Command::Migrate { dst_server, dst_port, dst_uuid, crucible_disks } => {
let dst_addr = SocketAddr::new(dst_server, dst_port);
let dst_client = Client::new(&format!("http://{dst_addr}"));
let dst_client = Client::new(&format!("http://{dst_addr}"))?;
let dst_uuid = dst_uuid.unwrap_or_else(Uuid::new_v4);
let disks = if let Some(crucible_disks) = crucible_disks {
parse_json_file(&crucible_disks)?
Expand Down
3 changes: 2 additions & 1 deletion lib/propolis-client/src/support.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ impl SerialConsoleStreamBuilder for PropolisSerialBuilder {
address: SocketAddr,
offset: WSClientOffset,
) -> Result<Box<dyn SerialConsoleStream>, WSError> {
let client = PropolisClient::new(&format!("http://{address}"));
let client = PropolisClient::new(&format!("http://{address}"))
.map_err(|e| WSError::Io(std::io::Error::other(e)))?;
let mut req = client.instance_serial();

match offset {
Expand Down
2 changes: 1 addition & 1 deletion phd-tests/framework/src/test_vm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ impl TestVm {
&vm_spec.bootrom_path,
)?;

let client = Client::new(&format!("http://{server_addr}"));
let client = Client::new(&format!("http://{server_addr}"))?;
let guest_os = guest_os::get_guest_os_adapter(vm_spec.guest_os_kind);
Ok(Self {
id: vm_id,
Expand Down
Loading