commit 3cbdb36b2b3cf8f4876d420776cb7f5636703c24
author Rob Tsuk <robtsuk@google.com> Wed Jan 16 11:13:59 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Jan 16 23:51:00 2019 +0000
tree 9dd415b6141aa4559116772cbe114b97017464ca
parent 2a5095a8ac37c1d8ead519b6bffabf436a2195b1

[voila] fuchsia-ui -> carnelian rename

Testing: manual
Change-Id: Ie54790cdad79a78e643b72cbafb0c354503e7741

bin/voila/BUILD.gn

diff --git a/bin/voila/BUILD.gn b/bin/voila/BUILD.gn
index 3eee626..09e27fc 100644
--- a/bin/voila/BUILD.gn
+++ b/bin/voila/BUILD.gn
@@ -14,9 +14,9 @@
     "//garnet/public/fidl/fuchsia.ui.viewsv1:fuchsia.ui.viewsv1-rustc",
     "//garnet/public/fidl/fuchsia.ui.viewsv1token:fuchsia.ui.viewsv1token-rustc",
     "//garnet/public/lib/fidl/rust/fidl",
+    "//garnet/public/rust/carnelian",
     "//garnet/public/rust/fuchsia-app",
     "//garnet/public/rust/fuchsia-scenic",
-    "//garnet/public/rust/fuchsia-ui",
     "//third_party/rust-crates/rustc_deps:failure",
     "//third_party/rust-crates/rustc_deps:parking_lot",
   ]

bin/voila/src/main.rs

diff --git a/bin/voila/src/main.rs b/bin/voila/src/main.rs
index 3213c12..aa42776 100644
--- a/bin/voila/src/main.rs
+++ b/bin/voila/src/main.rs
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+use carnelian::{App, AppAssistant, ViewAssistant, ViewAssistantContext, ViewAssistantPtr};
 use failure::Error;
 use fidl::endpoints::create_endpoints;
 use fidl_fuchsia_ui_gfx::{self as gfx, ColorRgba};
@@ -9,7 +10,6 @@
 use fidl_fuchsia_ui_viewsv1token::ViewOwnerMarker;
 use fuchsia_app::client::{App as LaunchedApp, Launcher};
 use fuchsia_scenic::{Circle, EntityNode, ImportNode, Material, Rectangle, SessionPtr, ShapeNode};
-use fuchsia_ui::{App, AppAssistant, ViewAssistant, ViewAssistantContext, ViewAssistantPtr};
 use parking_lot::Mutex;
 use std::collections::BTreeMap;
 use std::{any::Any, cell::RefCell};