Upgrade rbx_dom_weak, rbx_reflection, and rbx_xml

server/src/commands/build.rs

@@ -100,7 +100,7 @@ pub fn build(options: &BuildOptions) -> Result<(), BuildError> {
             // descendants.
 
             let root_id = tree.get_root_id();
-            rbx_xml::encode(&tree, &[root_id], &mut file)?;
+            rbx_xml::to_writer_default(&mut file, &tree, &[root_id])?;
         },
         OutputKind::Rbxlx => {
             // Place files don't contain an entry for the DataModel, but our
@@ -108,7 +108,7 @@ pub fn build(options: &BuildOptions) -> Result<(), BuildError> {
 
             let root_id = tree.get_root_id();
             let top_level_ids = tree.get_instance(root_id).unwrap().get_children_ids();
-            rbx_xml::encode(&tree, top_level_ids, &mut file)?;
+            rbx_xml::to_writer_default(&mut file, &tree, top_level_ids)?;
         },
         OutputKind::Rbxm => {
             let root_id = tree.get_root_id();

server/src/commands/upload.rs

@@ -80,10 +80,10 @@ pub fn upload(options: &UploadOptions) -> Result<(), UploadError> {
     match options.kind {
         Some("place") | None => {
             let top_level_ids = tree.get_instance(root_id).unwrap().get_children_ids();
-            rbx_xml::encode(&tree, top_level_ids, &mut contents)?;
+            rbx_xml::to_writer_default(&mut contents, &tree, top_level_ids)?;
         },
         Some("model") => {
-            rbx_xml::encode(&tree, &[root_id], &mut contents)?;
+            rbx_xml::to_writer_default(&mut contents, &tree, &[root_id])?;
         },
         Some(invalid) => return Err(UploadError::InvalidKind(invalid.to_owned())),
     }

server/src/imfs.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use failure::Fail;
-use serde_derive::{Serialize, Deserialize};
+use serde::{Serialize, Deserialize};
 
 use crate::project::{Project, ProjectNode};
 

server/src/path_map.rs

@@ -3,7 +3,7 @@ use std::{
     collections::{HashMap, HashSet},
 };
 
-use serde_derive::Serialize;
+use serde::Serialize;
 use log::warn;
 
 #[derive(Debug, Serialize)]

server/src/path_serializer.rs

@@ -10,7 +10,7 @@
 //!
 //! ```
 //! # use std::path::PathBuf;
-//! # use serde_derive::{Serialize, Deserialize};
+//! # use serde::{Serialize, Deserialize};
 //!
 //! #[derive(Serialize, Deserialize)]
 //! struct Mine {

server/src/project.rs

@@ -9,8 +9,7 @@ use std::{
 use log::warn;
 use failure::Fail;
 use rbx_dom_weak::{UnresolvedRbxValue, RbxValue};
-use serde_derive::{Serialize, Deserialize};
-use serde::{Serialize, Serializer};
+use serde::{Serialize, Serializer, Deserialize};
 
 static DEFAULT_PLACE: &'static str = include_str!("../assets/place.project.json");
 

server/src/rbx_session.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use rlua::Lua;
-use serde_derive::{Serialize, Deserialize};
+use serde::{Serialize, Deserialize};
 use log::{info, trace, error};
 use rbx_dom_weak::{RbxTree, RbxId};
 

server/src/rbx_snapshot.rs

@@ -14,7 +14,7 @@ use failure::Fail;
 use log::info;
 use maplit::hashmap;
 use rbx_dom_weak::{RbxTree, RbxValue, RbxInstanceProperties, UnresolvedRbxValue};
-use serde_derive::{Serialize, Deserialize};
+use serde::{Serialize, Deserialize};
 use rbx_reflection::{try_resolve_value, ValueResolveError};
 
 use crate::{
@@ -653,20 +653,13 @@ fn snapshot_xml_model_file<'source>(
         .file_stem().expect("Could not extract file stem")
         .to_str().expect("Could not convert path to UTF-8");
 
-    let mut temp_tree = RbxTree::new(RbxInstanceProperties {
-        name: "Temp".to_owned(),
-        class_name: "Folder".to_owned(),
-        properties: HashMap::new(),
-    });
-
-    let root_id = temp_tree.get_root_id();
-    rbx_xml::decode(&mut temp_tree, root_id, file.contents.as_slice())
+    let temp_tree = rbx_xml::from_reader_default(file.contents.as_slice())
         .map_err(|inner| SnapshotError::XmlModelDecodeError {
             inner,
             path: file.path.clone(),
         })?;
 
-    let root_instance = temp_tree.get_instance(root_id).unwrap();
+    let root_instance = temp_tree.get_instance(temp_tree.get_root_id()).unwrap();
     let children = root_instance.get_children_ids();
 
     match children.len() {

server/src/session_id.rs

@@ -1,4 +1,4 @@
-use serde_derive::{Serialize, Deserialize};
+use serde::{Serialize, Deserialize};
 use uuid::Uuid;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]

server/src/snapshot_reconciler.rs

@@ -11,7 +11,7 @@ use std::{
 };
 
 use rbx_dom_weak::{RbxTree, RbxId, RbxInstanceProperties, RbxValue};
-use serde_derive::{Serialize, Deserialize};
+use serde::{Serialize, Deserialize};
 
 use crate::{
     path_map::PathMap,

server/src/web/api.rs

@@ -21,7 +21,7 @@ use hyper::{
     Request,
     Response,
 };
-use serde_derive::{Serialize, Deserialize};
+use serde::{Serialize, Deserialize};
 use rbx_dom_weak::{RbxId, RbxInstance};
 
 use crate::{