chore: post rebase fixes

Author: Horusiath

collab/src/database/database_remapper.rs

@@ -1,5 +1,5 @@
-use collab::core::collab::{CollabOptions, CollabVersion, DataSource, VersionedData};
-use collab::core::origin::CollabOrigin;
+use crate::core::collab::{CollabOptions, CollabVersion, DataSource, VersionedData};
+use crate::core::origin::CollabOrigin;
 
 use crate::preclude::*;
 use std::collections::HashMap;

collab/src/document/document_remapper.rs

@@ -1,7 +1,7 @@
-use collab::core::collab::DataSource;
-use collab::core::collab::{CollabOptions, VersionedData};
-use collab::core::origin::CollabOrigin;
-use collab::preclude::*;
+use crate::core::collab::DataSource;
+use crate::core::collab::{CollabOptions, VersionedData};
+use crate::core::origin::CollabOrigin;
+use crate::preclude::*;
 use std::collections::HashMap;
 use uuid::Uuid;
 

collab/src/folder/hierarchy_builder.rs

@@ -5,7 +5,7 @@ use super::{
   ViewLayout, timestamp,
 };
 
-use collab::core::collab::CollabVersion;
+use crate::core::collab::CollabVersion;
 use serde_json::json;
 use std::fmt::{Display, Formatter};
 use std::future::Future;

collab/src/importer/space_view.rs

@@ -1,4 +1,4 @@
-use crate::core::collab::{CollabOptions, DataSource, default_client_id};
+use crate::core::collab::{CollabOptions, DataSource, VersionedData, default_client_id};
 use crate::core::origin::CollabOrigin;
 use crate::document::document_data::default_document_collab_data;
 use crate::error::CollabError;
@@ -17,7 +17,7 @@ pub fn create_space_view(
   space_info: SpaceInfo,
 ) -> Result<(ParentChildViews, Collab), CollabError> {
   let client_id = default_client_id();
-  let import_container_doc_state = default_document_collab_data(&view_id.to_string(), client_id)
+  let encoded_collab = default_document_collab_data(&view_id.to_string(), client_id)
     .map_err(|err| CollabError::Internal(err.into()))?;
 
   let data = VersionedData::new(encoded_collab.doc_state, encoded_collab.collab_version);