more fixups

Created using spr 1.3.6-beta.1

Author: sunshowers

bin/propolis-server/src/lib/serial/history_buffer.rs

@@ -6,7 +6,7 @@
 //! first mebibyte and the most recent mebibyte of console output.
 
 use dropshot::HttpError;
-use propolis_api_types::serial as api;
+use propolis_api_types::serial as api_serial;
 use serde::{Deserialize, Serialize};
 use std::collections::VecDeque;
 use std::convert::TryFrom;
@@ -45,17 +45,19 @@ pub(crate) enum SerialHistoryOffset {
     MostRecent(usize),
 }
 
-impl TryFrom<&api::InstanceSerialConsoleStreamRequest> for SerialHistoryOffset {
+impl TryFrom<&api_serial::InstanceSerialConsoleStreamRequest>
+    for SerialHistoryOffset
+{
     type Error = ();
     fn try_from(
-        req: &api::InstanceSerialConsoleStreamRequest,
+        req: &api_serial::InstanceSerialConsoleStreamRequest,
     ) -> Result<Self, ()> {
         match req {
-            api::InstanceSerialConsoleStreamRequest {
+            api_serial::InstanceSerialConsoleStreamRequest {
                 from_start: Some(offset),
                 most_recent: None,
             } => Ok(SerialHistoryOffset::FromStart(*offset as usize)),
-            api::InstanceSerialConsoleStreamRequest {
+            api_serial::InstanceSerialConsoleStreamRequest {
                 from_start: None,
                 most_recent: Some(offset),
             } => Ok(SerialHistoryOffset::MostRecent(*offset as usize)),
@@ -64,21 +66,21 @@ impl TryFrom<&api::InstanceSerialConsoleStreamRequest> for SerialHistoryOffset {
     }
 }
 
-impl TryFrom<&api::InstanceSerialConsoleHistoryRequest>
+impl TryFrom<&api_serial::InstanceSerialConsoleHistoryRequest>
     for SerialHistoryOffset
 {
     type Error = HttpError;
 
     fn try_from(
-        req: &api::InstanceSerialConsoleHistoryRequest,
+        req: &api_serial::InstanceSerialConsoleHistoryRequest,
     ) -> Result<SerialHistoryOffset, HttpError> {
         match req {
-            api::InstanceSerialConsoleHistoryRequest {
+            api_serial::InstanceSerialConsoleHistoryRequest {
                 from_start: Some(offset),
                 most_recent: None,
                 ..
             } => Ok(SerialHistoryOffset::FromStart(*offset as usize)),
-            api::InstanceSerialConsoleHistoryRequest {
+            api_serial::InstanceSerialConsoleHistoryRequest {
                 from_start: None,
                 most_recent: Some(offset),
                 ..

lib/propolis-client/src/lib.rs

@@ -48,8 +48,6 @@ progenitor::generate_api!(
     replace = {
         PciPath = propolis_api_types_versions::latest::instance_spec::PciPath,
         ReplacementComponent = propolis_api_types_versions::latest::instance::ReplacementComponent,
-        // V0 types for backward compatibility (from v1)
-        InstanceSpecV0 = propolis_api_types_versions::v1::instance_spec::InstanceSpec,
         InstanceSpec = propolis_api_types_versions::latest::instance_spec::InstanceSpec,
         InstanceSpecStatus = propolis_api_types_versions::latest::instance_spec::InstanceSpecStatus,
         InstanceProperties = propolis_api_types_versions::latest::instance::InstanceProperties,