Upgrade to rbx_tree and friends 0.1.0

rojo-rbx · Jan 15, 2019 · a543646 · a543646
1 parent 14ab85a
commit a543646
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/server/Cargo.toml b/server/Cargo.toml
@@ -35,9 +35,9 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 uuid = { version = "0.7", features = ["v4", "serde"] }
-rbx_tree = { rev = "8442d57a7a21072a380134962724281d044c65ad", git = "https://github.com/LPGhatguy/rbx-tree.git" }
-rbx_xml = { rev = "8442d57a7a21072a380134962724281d044c65ad", git = "https://github.com/LPGhatguy/rbx-tree.git" }
-rbx_binary = { rev = "8442d57a7a21072a380134962724281d044c65ad", git = "https://github.com/LPGhatguy/rbx-tree.git" }
+rbx_tree = "0.1.0"
+rbx_xml = "0.1.0"
+rbx_binary = "0.1.0"
 
 [dev-dependencies]
 tempfile = "3.0"

diff --git a/server/src/commands/build.rs b/server/src/commands/build.rs
@@ -52,6 +52,9 @@ pub enum BuildError {
 
     #[fail(display = "XML model file error")]
     XmlModelEncodeError(rbx_xml::EncodeError),
+
+    #[fail(display = "Binary model file error")]
+    BinaryModelEncodeError(rbx_binary::EncodeError)
 }
 
 impl From<ProjectLoadFuzzyError> for BuildError {
@@ -72,6 +75,12 @@ impl From<rbx_xml::EncodeError> for BuildError {
     }
 }
 
+impl From<rbx_binary::EncodeError> for BuildError {
+    fn from(error: rbx_binary::EncodeError) -> BuildError {
+        BuildError::BinaryModelEncodeError(error)
+    }
+}
+
 pub fn build(options: &BuildOptions) -> Result<(), BuildError> {
     let output_kind = options.output_kind
         .or_else(|| detect_output_kind(options))

diff --git a/server/src/rbx_session.rs b/server/src/rbx_session.rs
@@ -9,7 +9,7 @@ use std::{
 
 use failure::Fail;
 
-use rbx_tree::{RbxTree, RbxInstance, RbxValue, RbxId};
+use rbx_tree::{RbxTree, RbxInstanceProperties, RbxValue, RbxId};
 
 use crate::{
     project::{Project, ProjectNode, InstanceProjectNodeMetadata},
@@ -346,7 +346,7 @@ fn snapshot_xml_model<'a>(
     instance_name: Cow<'a, str>,
     file: &ImfsFile,
 ) -> Result<Option<RbxSnapshotInstance<'a>>, SnapshotError> {
-    let mut temp_tree = RbxTree::new(RbxInstance {
+    let mut temp_tree = RbxTree::new(RbxInstanceProperties {
         name: "Temp".to_owned(),
         class_name: "Folder".to_owned(),
         properties: HashMap::new(),
@@ -377,7 +377,7 @@ fn snapshot_binary_model<'a>(
     instance_name: Cow<'a, str>,
     file: &ImfsFile,
 ) -> Result<Option<RbxSnapshotInstance<'a>>, SnapshotError> {
-    let mut temp_tree = RbxTree::new(RbxInstance {
+    let mut temp_tree = RbxTree::new(RbxInstanceProperties {
         name: "Temp".to_owned(),
         class_name: "Folder".to_owned(),
         properties: HashMap::new(),

diff --git a/server/src/rbx_snapshot.rs b/server/src/rbx_snapshot.rs
@@ -6,7 +6,7 @@ use std::{
     path::PathBuf,
 };
 
-use rbx_tree::{RbxTree, RbxId, RbxInstance, RbxValue};
+use rbx_tree::{RbxTree, RbxId, RbxInstanceProperties, RbxValue};
 
 use crate::{
     path_map::PathMap,
@@ -159,14 +159,14 @@ pub fn reconcile_subtree(
     reconcile_instance_children(tree, id, snapshot, path_map, instance_metadata_map, changes);
 }
 
-fn reify_core(snapshot: &RbxSnapshotInstance) -> RbxInstance {
+fn reify_core(snapshot: &RbxSnapshotInstance) -> RbxInstanceProperties {
     let mut properties = HashMap::new();
 
     for (key, value) in &snapshot.properties {
         properties.insert(key.clone(), value.clone());
     }
 
-    let instance = RbxInstance {
+    let instance = RbxInstanceProperties {
         name: snapshot.name.to_string(),
         class_name: snapshot.class_name.to_string(),
         properties,
@@ -175,7 +175,7 @@ fn reify_core(snapshot: &RbxSnapshotInstance) -> RbxInstance {
     instance
 }
 
-fn reconcile_instance_properties(instance: &mut RbxInstance, snapshot: &RbxSnapshotInstance) -> bool {
+fn reconcile_instance_properties(instance: &mut RbxInstanceProperties, snapshot: &RbxSnapshotInstance) -> bool {
     let mut has_diffs = false;
 
     if instance.name != snapshot.name {

diff --git a/server/src/web.rs b/server/src/web.rs
@@ -10,7 +10,7 @@ use rouille::{
     Request,
     Response,
 };
-use rbx_tree::{RbxId, RootedRbxInstance};
+use rbx_tree::{RbxId, RbxInstance};
 
 use crate::{
     session::Session,
@@ -28,7 +28,7 @@ use crate::{
 #[derive(Debug, Serialize, Deserialize)]
 pub struct InstanceWithMetadata<'a> {
     #[serde(flatten)]
-    pub instance: Cow<'a, RootedRbxInstance>,
+    pub instance: Cow<'a, RbxInstance>,
 
     #[serde(rename = "Metadata")]
     pub metadata: Option<Cow<'a, InstanceProjectNodeMetadata>>,