Rename resolution -> resolve or solution

Author: mkaput

murek/src/ops/compile.rs

@@ -7,7 +7,7 @@ use cairo_lang_compiler::CompilerConfig;
 use crate::core::workspace::Workspace;
 use crate::core::PackageId;
 use crate::ops;
-use crate::ops::WorkspaceResolution;
+use crate::ops::WorkspaceResolve;
 
 #[tracing::instrument(skip_all, level = "debug")]
 pub fn compile(ws: &Workspace<'_>, on_diagnostic: Box<dyn FnMut(String)>) -> Result<()> {
@@ -35,24 +35,21 @@ pub fn compile(ws: &Workspace<'_>, on_diagnostic: Box<dyn FnMut(String)>) -> Res
     Ok(())
 }
 
-fn build_project_config(
-    member_id: PackageId,
-    resolution: &WorkspaceResolution,
-) -> Result<ProjectConfig> {
-    let crate_roots = resolution
+fn build_project_config(member_id: PackageId, resolve: &WorkspaceResolve) -> Result<ProjectConfig> {
+    let crate_roots = resolve
         .resolve
         .collect_compilation_unit_of(member_id)
         .iter()
         .map(|id| {
-            let pkg = &resolution.packages[id];
+            let pkg = &resolve.packages[id];
             (pkg.id.name.clone(), pkg.source_dir())
         })
         .collect();
 
     let content = ProjectConfigContent { crate_roots };
 
     Ok(ProjectConfig {
-        base_path: resolution.packages[&member_id].root().into(),
+        base_path: resolve.packages[&member_id].root().into(),
         content,
     })
 }

murek/src/ops/resolve.rs

@@ -11,7 +11,7 @@ use crate::core::workspace::Workspace;
 use crate::internal::asyncx::AwaitSync;
 use crate::resolver;
 
-pub struct WorkspaceResolution {
+pub struct WorkspaceResolve {
     pub resolve: Resolve,
     pub packages: HashMap<PackageId, Package>,
 }
@@ -22,7 +22,7 @@ pub struct WorkspaceResolution {
     skip_all,
     fields(root = ws.root().display().to_string())
 )]
-pub fn resolve_workspace(ws: &Workspace<'_>) -> Result<WorkspaceResolution> {
+pub fn resolve_workspace(ws: &Workspace<'_>) -> Result<WorkspaceResolve> {
     async {
         let source_map = SourceMap::preloaded(ws.members(), ws.config());
         let mut registry_cache = RegistryCache::new(source_map);
@@ -41,7 +41,7 @@ pub fn resolve_workspace(ws: &Workspace<'_>) -> Result<WorkspaceResolution> {
         // so the `download` calls in this method should be cheap, but this may change the future.
         let packages = collect_packages_from_resolve_graph(&resolve, &mut registry_cache).await?;
 
-        Ok(WorkspaceResolution { resolve, packages })
+        Ok(WorkspaceResolve { resolve, packages })
     }
     .await_sync()
 }

murek/src/resolver/mod.rs

@@ -100,10 +100,10 @@ pub async fn resolve(summaries: &[Summary], registry: &mut dyn Registry) -> Resu
         incompatibilities.sort();
         let incompatibilities = incompatibilities.join("\n");
         bail!(formatdoc! {"
-            Version resolution failed:
+            Version solving failed:
             {incompatibilities}
 
-            Scarb does not have real version resolution algorithm yet.
+            Scarb does not have real version solving algorithm yet.
             Perhaps in the future this conflict could be resolved, but currently,
             please upgrade your dependencies to use latest versions of their dependencies.
         "});
@@ -303,10 +303,10 @@ mod tests {
             //     "foo v1.0.0 (/main)"
             // ]),
             Err(indoc! {"
-            Version resolution failed:
+            Version solving failed:
             - bar v2.0.0 (/main/) cannot use baz v1.0.0 (/main/), because bar requires baz ^2.0.0
 
-            Scarb does not have real version resolution algorithm yet.
+            Scarb does not have real version solving algorithm yet.
             Perhaps in the future this conflict could be resolved, but currently,
             please upgrade your dependencies to use latest versions of their dependencies.
             "}),
@@ -333,10 +333,10 @@ mod tests {
             //     "foo v2.9.0 (/main)"
             // ]),
             Err(indoc! {"
-            Version resolution failed:
+            Version solving failed:
             - foo v2.7.0 (/main/) cannot use baz v2.1.0 (/main/), because foo requires baz ~1.7.1
 
-            Scarb does not have real version resolution algorithm yet.
+            Scarb does not have real version solving algorithm yet.
             Perhaps in the future this conflict could be resolved, but currently,
             please upgrade your dependencies to use latest versions of their dependencies.
             "}),