cleanup after rebase

backend/src/action.rs

@@ -14,7 +14,6 @@ use crate::context::RpcContext;
 use crate::id::{Id, ImageId, InvalidId};
 use crate::procedure::{PackageProcedure, ProcedureName};
 use crate::s9pk::manifest::PackageId;
-use crate::status::health_check::HealthCheckId;
 use crate::util::serde::{display_serializable, parse_stdin_deserializable, IoFormat};
 use crate::util::Version;
 use crate::volume::Volumes;

backend/src/dependencies.rs

@@ -17,9 +17,7 @@ use tracing::instrument;
 use crate::config::spec::PackagePointerSpec;
 use crate::config::{not_found, Config, ConfigReceipts, ConfigSpec};
 use crate::context::RpcContext;
-use crate::db::model::{
+use crate::db::model::{CurrentDependencies, CurrentDependents, InstalledPackageDataEntry};
-    CurrentDependencies, CurrentDependencyInfo, CurrentDependents, InstalledPackageDataEntry,
-};
 use crate::procedure::{NoOutput, PackageProcedure};
 use crate::s9pk::manifest::{Manifest, PackageId};
 use crate::status::health_check::{HealthCheckId, HealthCheckResult};

backend/src/install/cleanup.rs

@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, HashMap};
+use std::collections::HashMap;
 
 use bollard::image::ListImagesOptions;
 use patch_db::{DbHandle, LockReceipt, LockTargetId, LockType, PatchDbHandle, Verifier};
@@ -9,8 +9,8 @@ use super::{PKG_ARCHIVE_DIR, PKG_DOCKER_DIR};
 use crate::config::{not_found, ConfigReceipts};
 use crate::context::RpcContext;
 use crate::db::model::{
-    AllPackageData, CurrentDependencies, CurrentDependencyInfo, CurrentDependents,
+    AllPackageData, CurrentDependencies, CurrentDependents, InstalledPackageDataEntry,
-    InstalledPackageDataEntry, PackageDataEntry,
+    PackageDataEntry,
 };
 use crate::dependencies::{
     reconfigure_dependents_with_live_pointers, DependencyErrors, TryHealReceipts,

backend/src/install/mod.rs

@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::BTreeMap;
 use std::io::SeekFrom;
 use std::marker::PhantomData;
 use std::path::{Path, PathBuf};

backend/src/procedure/js_scripts.rs

@@ -635,11 +635,6 @@ mod js_runtime {
             Ok(ctx.input.clone())
         }
         #[op]
-        fn get_input(state: &mut OpState) -> Result<Value, AnyError> {
-            let ctx = state.borrow::<JsContext>();
-            Ok(ctx.input.clone())
-        }
-        #[op]
         fn set_value(state: &mut OpState, value: Value) -> Result<(), AnyError> {
             let mut answer = state.borrow::<AnswerState>().0.lock();
             *answer = value;

backend/src/procedure/mod.rs

@@ -79,7 +79,7 @@ pub enum PackageProcedure {
 impl PackageProcedure {
     pub fn is_script(&self) -> bool {
         match self {
-            Self::Js(_) => true,
+            Self::Script(_) => true,
             _ => false,
         }
     }