chore: fix merge bugs

packages/api/traefik-provider/src/route/core.rs

@@ -32,7 +32,7 @@ pub async fn config(
 ) -> GlobalResult<types::TraefikConfigResponseNullified> {
 	ctx.auth().token(&token).await?;
 
-	let config = types::TraefikConfigResponse::default();
+	let mut config = types::TraefikConfigResponse::default();
 
 	// Fetch configs and catch any errors
 	build_cdn(&ctx, &mut config).await?;

packages/infra/client/actor-kv/src/key.rs

@@ -28,7 +28,8 @@ impl PartialEq for Key {
 				.map(|x| x.as_ref())
 				.eq(b.iter().map(|x| x.as_ref())),
 			(Key::JsOutKey(a), Key::JsOutKey(b)) => a == b,
-			_ => false,
+			(Key::JsInKey(a), Key::JsOutKey(b)) => a.iter().map(|x| x.as_ref()).eq(b.iter()),
+			(Key::JsOutKey(a), Key::JsInKey(b)) => a.iter().eq(b.iter().map(|x| x.as_ref())),
 		}
 	}
 }
@@ -55,12 +56,12 @@ impl std::hash::Hash for Key {
 impl Key {
 	pub fn len(&self) -> usize {
 		match self {
-			// Arbitrary 4 accounting for nesting overhead
 			Key::JsInKey(js_in_key) => {
+				// Arbitrary 4 accounting for nesting overhead
 				js_in_key.iter().fold(0, |acc, x| acc + x.len()) + 4 * js_in_key.len()
 			}
-			// Arbitrary 4 accounting for nesting overhead
 			Key::JsOutKey(out_key) => {
+				// Arbitrary 4 accounting for nesting overhead
 				out_key.iter().fold(0, |acc, x| acc + x.len()) + 4 * out_key.len()
 			}
 		}

packages/infra/client/manager/src/config.rs

@@ -85,7 +85,7 @@ pub struct Runner {
 
 	/// If true, a cgroup will be created for the runners.
 	///
-	/// This should only be disabled for testing & development.
+	/// This should not be disabled if running the client with a daemon.
 	pub use_cgroup: Option<bool>,
 
 	pub container_runner_binary_path: Option<PathBuf>,

packages/infra/client/manager/src/ctx.rs

@@ -614,7 +614,7 @@ impl Ctx {
 	}
 
 	pub fn fdb_cluster_path(&self) -> PathBuf {
-		self.config.data_dir.join("fdb.cluster")
+		self.config().runtime.data_dir().join("fdb.cluster")
 	}
 
 	pub fn actors_path(&self) -> PathBuf {