From 2890c677d4d2d6886b6de619ec2d4a81f52c1a21 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Thu, 14 Feb 2019 17:22:44 -0800 Subject: [PATCH] Bump dependency from rbx_tree 0.2.0 to rbx_dom_weak 0.3.0 --- Cargo.lock | 24 ++++++++++++------------ server/Cargo.toml | 6 +++--- server/src/project.rs | 2 +- server/src/rbx_session.rs | 2 +- server/src/rbx_snapshot.rs | 2 +- server/src/snapshot_reconciler.rs | 2 +- server/src/visualize.rs | 2 +- server/src/web.rs | 4 ++-- server/tests/read_projects.rs | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ce0a6905..7440e5a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1179,18 +1179,18 @@ dependencies = [ [[package]] name = "rbx_binary" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lz4 1.23.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rbx_tree 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rbx_dom_weak 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "rbx_tree" -version = "0.2.0" +name = "rbx_dom_weak" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1200,7 +1200,7 @@ dependencies = [ [[package]] name = "rbx_xml" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1208,7 +1208,7 @@ dependencies = [ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rbx_tree 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rbx_dom_weak 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1305,9 +1305,9 @@ dependencies = [ "paste 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rbx_binary 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rbx_tree 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rbx_xml 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rbx_binary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rbx_dom_weak 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rbx_xml 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.9 (registry+https://github.com/rust-lang/crates.io-index)", "rouille 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2067,9 +2067,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46fbd5550acf75b0c2730f5dd1873751daf9beb8f11b44027778fae50d7feca" "checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05" "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -"checksum rbx_binary 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4cdf4806920e6e1cd9f91651b8fdb5d811f4e5a98a76b2893e97effa40d62054" -"checksum rbx_tree 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b605ef3e2ff864705720e382a5499fc29a8d93cd3fbfc4724770825f6760462" -"checksum rbx_xml 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e4cf33e0a240f367ad98d553e55e755b5cb4790b02284a34e130ba646b4f191" +"checksum rbx_binary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c4d3bffbec1f20f66684448e46ef45dad2fbf1185c3d8f3e29018f027484ffc" +"checksum rbx_dom_weak 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a67bbec623f2f12992dbf2e647deb3fe38613d4f874a8feeae566a931bebe63a" +"checksum rbx_xml 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2b394e64979c52190e6462dd81d5b2258cdfb7e3891cefaff5d3c4af7cdc07b5" "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" "checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" diff --git a/server/Cargo.toml b/server/Cargo.toml index 479e99f8..cab9a2a1 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -24,9 +24,9 @@ log = "0.4" maplit = "1.0.1" notify = "4.0" rand = "0.4" -rbx_binary = "0.2.0" -rbx_tree = "0.2.0" -rbx_xml = "0.2.0" +rbx_binary = "0.3.0" +rbx_dom_weak = "0.3.0" +rbx_xml = "0.3.0" regex = "1.0" reqwest = "0.9.5" rouille = "2.1" diff --git a/server/src/project.rs b/server/src/project.rs index 46ea7492..6b03a176 100644 --- a/server/src/project.rs +++ b/server/src/project.rs @@ -9,7 +9,7 @@ use std::{ use log::warn; use failure::Fail; use maplit::hashmap; -use rbx_tree::RbxValue; +use rbx_dom_weak::RbxValue; use serde_derive::{Serialize, Deserialize}; pub static PROJECT_FILENAME: &'static str = "default.project.json"; diff --git a/server/src/rbx_session.rs b/server/src/rbx_session.rs index 50124916..66b2af17 100644 --- a/server/src/rbx_session.rs +++ b/server/src/rbx_session.rs @@ -8,7 +8,7 @@ use std::{ use serde_derive::{Serialize, Deserialize}; use log::{info, trace}; -use rbx_tree::{RbxTree, RbxId}; +use rbx_dom_weak::{RbxTree, RbxId}; use crate::{ project::{Project, ProjectNode}, diff --git a/server/src/rbx_snapshot.rs b/server/src/rbx_snapshot.rs index e8318d70..fe5443be 100644 --- a/server/src/rbx_snapshot.rs +++ b/server/src/rbx_snapshot.rs @@ -12,7 +12,7 @@ use std::{ use failure::Fail; use log::info; use maplit::hashmap; -use rbx_tree::{RbxTree, RbxValue, RbxInstanceProperties}; +use rbx_dom_weak::{RbxTree, RbxValue, RbxInstanceProperties}; use serde_derive::{Serialize, Deserialize}; use crate::{ diff --git a/server/src/snapshot_reconciler.rs b/server/src/snapshot_reconciler.rs index ff98aa16..cc4b686e 100644 --- a/server/src/snapshot_reconciler.rs +++ b/server/src/snapshot_reconciler.rs @@ -10,7 +10,7 @@ use std::{ str, }; -use rbx_tree::{RbxTree, RbxId, RbxInstanceProperties, RbxValue}; +use rbx_dom_weak::{RbxTree, RbxId, RbxInstanceProperties, RbxValue}; use serde_derive::{Serialize, Deserialize}; use crate::{ diff --git a/server/src/visualize.rs b/server/src/visualize.rs index c64bd328..4afa60b0 100644 --- a/server/src/visualize.rs +++ b/server/src/visualize.rs @@ -6,7 +6,7 @@ use std::{ }; use log::warn; -use rbx_tree::RbxId; +use rbx_dom_weak::RbxId; use crate::{ imfs::{Imfs, ImfsItem}, diff --git a/server/src/web.rs b/server/src/web.rs index e3d31c84..91ec9a89 100644 --- a/server/src/web.rs +++ b/server/src/web.rs @@ -15,7 +15,7 @@ use rouille::{ Request, Response, }; -use rbx_tree::{RbxId, RbxInstance}; +use rbx_dom_weak::{RbxId, RbxInstance}; use crate::{ live_session::LiveSession, @@ -43,7 +43,7 @@ impl PublicInstanceMetadata { } /// Used to attach metadata specific to Rojo to instances, which come from the -/// rbx_tree crate. +/// rbx_dom_weak crate. /// /// Both fields are wrapped in Cow in order to make owned-vs-borrowed simpler /// for tests. diff --git a/server/tests/read_projects.rs b/server/tests/read_projects.rs index d5314a21..1746cf56 100644 --- a/server/tests/read_projects.rs +++ b/server/tests/read_projects.rs @@ -6,7 +6,7 @@ use std::{ }; use pretty_assertions::assert_eq; -use rbx_tree::RbxValue; +use rbx_dom_weak::RbxValue; use librojo::{ project::{Project, ProjectNode},