fix merge

Signed-off-by: Andrius Pukšta <andrius.puksta@sensmetry.com>

Author: andrius-puksta-sensmetry

bindings/java/Cargo.toml

@@ -19,9 +19,6 @@ crate-type = ["cdylib"]
 sysand-core = { path = "../../core", features = ["std", "filesystem", "networking"] }
 camino.workspace = true
 jni = "0.21.1"
-indexmap = { version = "2.12.1", default-features = false, features = ["serde"] }
-url = { version = "2.5.7", default-features = false }
-tokio = { version = "1.48.0", default-features = false, features = ["rt"] }
 reqwest-middleware = { version = "0.5.0" }
 indexmap = { version = "2.13.0", default-features = false, features = ["serde"] }
 url = { version = "2.5.8", default-features = false }

bindings/js/package-lock.json

@@ -1,4 +1,4 @@
-use camino::Utf8PathBuf;
+use camino::{Utf8Path, Utf8PathBuf};
 use fluent_uri::Iri;
 
 #[cfg(feature = "python")]
@@ -63,7 +63,7 @@ pub enum WorkspaceReadError {
     #[error("failed to deserialize `.workspace.json`: {0}")]
     Deserialize(#[from] WorkspaceDeserializationError),
     #[error("invalid workspace configuration in `{0}`: {1}")]
-    Validation(PathBuf, WorkspaceValidationError),
+    Validation(Utf8PathBuf, WorkspaceValidationError),
 }
 
 #[derive(Debug, Error)]

core/src/workspace.rs

@@ -5,6 +5,7 @@ use std::{collections::HashMap, path::Path, sync::Arc};
 
 use anyhow::Result;
 
+use camino::Utf8Path;
 use fluent_uri::Iri;
 use sysand_core::{
     add::do_add,
@@ -87,7 +88,7 @@ pub fn command_add(
 }
 
 #[expect(clippy::too_many_arguments)]
-fn resolve_deps<P: AsRef<Path>>(
+fn resolve_deps<P: AsRef<Utf8Path>>(
     no_sync: bool,
     resolution_opts: ResolutionOptions,
     config: &Config,

sysand/src/commands/add.rs

@@ -3,7 +3,7 @@ use camino::{Utf8Path, Utf8PathBuf};
 use fluent_uri::Iri;
 use semver::Version;
 
-use std::{collections::HashMap, fs, io::ErrorKind, mem, sync::Arc};
+use std::{collections::HashMap, fs, io::ErrorKind, sync::Arc};
 
 use sysand_core::{
     commands::lock::{DEFAULT_LOCKFILE_NAME, LockOutcome},
@@ -43,13 +43,6 @@ pub fn command_clone(
     client: reqwest_middleware::ClientWithMiddleware,
     runtime: Arc<tokio::runtime::Runtime>,
 ) -> Result<()> {
-    let ResolutionOptions {
-        index,
-        default_index,
-        no_index,
-        include_std,
-    } = resolution_opts;
-
     let target: Utf8PathBuf = target.unwrap_or_else(|| ".".into());
     let project_path = {
         // Canonicalization is performed only for better error messages
@@ -156,7 +149,7 @@ fn obtain_project(
     config: &Config,
     client: &reqwest_middleware::ClientWithMiddleware,
     runtime: &Arc<tokio::runtime::Runtime>,
-    project_path: PathBuf,
+    project_path: Utf8PathBuf,
 ) -> Result<
     (
         bool,
@@ -361,10 +354,10 @@ pub fn get_project_version<R: ResolveRead>(
 /// Removes all files in the directory.
 /// All errors are ignored.
 fn clean_dir<P: AsRef<Utf8Path>>(path: P) {
-    let Ok(entries) = fs::read_dir(&path) else {
+    let Ok(entries) = fs::read_dir(path.as_ref()) else {
         return;
     };
-    log::debug!("clearing contents of dir `{}`", path.as_ref().display());
+    log::debug!("clearing contents of dir `{}`", path.as_ref());
 
     for entry in entries {
         let Ok(entry) = entry else { continue };

sysand/src/commands/clone.rs

@@ -4,9 +4,8 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use anyhow::{Result, bail};
+use anyhow::Result;
 use camino::Utf8Path;
-use pubgrub::Reporter as _;
 
 use sysand_core::{
     commands::lock::{DEFAULT_LOCKFILE_NAME, LockOutcome, do_lock_local_editable},
@@ -56,7 +55,7 @@ pub fn command_lock<P: AsRef<Utf8Path>>(
         w.projects()
             .iter()
             .find(|p| Utf8Path::new(&p.path) == path.as_ref())
-            .map(|p| p.iris)
+            .map(|p| p.iris.clone())
     } else {
         None
     };
@@ -115,7 +114,7 @@ pub fn create_resolver<P: AsRef<Utf8Path>>(
             projects: memory_projects,
         },
         standard_resolver(
-            cwd,
+            Some(cwd),
             if local_env_path.is_dir() {
                 Some(local_env_path)
             } else {

sysand/src/commands/lock.rs

@@ -289,7 +289,7 @@ pub fn run_cli(args: cli::Args) -> Result<()> {
                 Ok(l) => match Lock::from_str(&l) {
                     Ok(l) => l,
                     // Include file path in errors
-                    Err(e) => bail!("invalid lockfile `{}`:\n{e}", lockfile.display()),
+                    Err(e) => bail!("invalid lockfile `{lockfile}`:\n{e}"),
                 },
                 Err(e) => {
                     if let ErrorKind::NotFound = e.kind() {
@@ -302,7 +302,7 @@ pub fn run_cli(args: cli::Args) -> Result<()> {
                             runtime.clone(),
                         )?
                     } else {
-                        bail!("failed to read lockfile `{}`: {e}", lockfile.display())
+                        bail!("failed to read lockfile `{lockfile}`: {e}")
                     }
                 }
             };

sysand/src/lib.rs

@@ -7,10 +7,8 @@ use camino_tempfile::Utf8TempDir;
 use rexpect::session::{PtySession, spawn_command};
 #[cfg(not(target_os = "windows"))]
 use std::os::unix::process::ExitStatusExt;
-use std::path::{Path, PathBuf};
 use std::{
     error::Error,
-    io::Write,
     process::{Command, Output},
 };