Fix compile errors

Author: NicholasLYang

crates/turborepo-lib/src/engine/builder.rs

@@ -760,7 +760,7 @@ mod test {
                 $(
                     let path = $root.join_components(&["packages", $name, "package.json"]);
                     let dependencies = Some($deps.iter().map(|dep: &&str| (dep.to_string(), "workspace:*".to_string())).collect());
-                    let package_json = PackageJson { name: Some($name.to_string()), dependencies, ..Default::default() };
+                    let package_json = PackageJson { name: Some(Spanned::new($name.to_string())), dependencies, ..Default::default() };
                     _map.insert(path, package_json);
                 )+
                 _map

crates/turborepo-lib/src/engine/mod.rs

@@ -638,7 +638,7 @@ mod test {
                     };
 
                     let package = PackageJson {
-                        name: Some(name.to_string()),
+                        name: Some(Spanned::new(name.to_string())),
                         scripts,
                         ..Default::default()
                     };

crates/turborepo-lib/src/run/scope/filter.rs

@@ -713,6 +713,7 @@ mod test {
     use tempfile::TempDir;
     use test_case::test_case;
     use turbopath::{AbsoluteSystemPathBuf, AnchoredSystemPathBuf, RelativeUnixPathBuf};
+    use turborepo_errors::Spanned;
     use turborepo_repository::{
         change_mapper::PackageInclusionReason,
         discovery::PackageDiscovery,
@@ -806,7 +807,7 @@ mod test {
                         RelativeUnixPathBuf::new(format!("{package_path}/package.json")).unwrap(),
                     ),
                     PackageJson {
-                        name: Some(name.to_string()),
+                        name: Some(Spanned::new(name.to_string())),
                         dependencies: dependencies.get(name).map(|v| {
                             v.iter()
                                 .map(|name| (name.to_string(), "*".to_string()))

crates/turborepo-lsp/src/lib.rs

@@ -325,7 +325,7 @@ impl LanguageServer for Backend {
             let package_json_name = if repo_root.contains(&wd.package_json) {
                 Some("//")
             } else {
-                package_json.name.as_deref()
+                package_json.name.as_ref().map(|name| name.as_str())
             };
 
             // todo: use jsonc_ast instead of text search
@@ -613,7 +613,7 @@ impl LanguageServer for Backend {
             .iter()
             .flat_map(|p| p.scripts.keys().map(move |k| (p.name.clone(), k)))
             .map(|(package, s)| CompletionItem {
-                label: format!("{}#{}", package.unwrap_or_default(), s),
+                label: format!("{}#{}", package.unwrap_or_default().into_inner(), s),
                 kind: Some(CompletionItemKind::FIELD),
                 ..Default::default()
             });
@@ -708,7 +708,7 @@ impl Backend {
                     {
                         Some("//".to_string())
                     } else {
-                        package_json.name
+                        package_json.name.map(|name| name.into_inner())
                     };
                     Some(
                         package_json

crates/turborepo-repository/src/package_graph/builder.rs

@@ -591,6 +591,8 @@ impl PackageInfo {
 mod test {
     use std::assert_matches::assert_matches;
 
+    use turborepo_errors::Spanned;
+
     use super::*;
 
     struct MockDiscovery;
@@ -618,7 +620,7 @@ mod test {
         let builder = PackageGraphBuilder::new(
             &root,
             PackageJson {
-                name: Some("root".into()),
+                name: Some(Spanned::new("root".into())),
                 ..Default::default()
             },
         )
@@ -628,14 +630,14 @@ mod test {
             map.insert(
                 root.join_component("a"),
                 PackageJson {
-                    name: Some("foo".into()),
+                    name: Some(Spanned::new("foo".into())),
                     ..Default::default()
                 },
             );
             map.insert(
                 root.join_component("b"),
                 PackageJson {
-                    name: Some("foo".into()),
+                    name: Some(Spanned::new("foo".into())),
                     ..Default::default()
                 },
             );

crates/turborepo-repository/src/package_graph/mod.rs

@@ -623,6 +623,7 @@ mod test {
     use std::assert_matches::assert_matches;
 
     use serde_json::json;
+    use turborepo_errors::Spanned;
 
     use super::*;
     use crate::discovery::PackageDiscovery;
@@ -652,7 +653,7 @@ mod test {
         let pkg_graph = PackageGraph::builder(
             &root,
             PackageJson {
-                name: Some("my-package".to_owned()),
+                name: Some(Spanned::new("my-package".to_owned())),
                 ..Default::default()
             },
         )

packages/turbo-repository/rust/src/internal.rs

@@ -132,7 +132,11 @@ impl Workspace {
                 // package_json_path)
                 path.parent()
                     .map(|package_path| {
-                        Ok(Package::new(name, &self.workspace_state.root, package_path))
+                        Ok(Package::new(
+                            name.into_inner(),
+                            &self.workspace_state.root,
+                            package_path,
+                        ))
                     })
                     .or_else(|| Some(Err(Error::MissingParent(path.to_owned()))))
             })