From a5f44f2759225775b453574f3557fd0f42cf3646 Mon Sep 17 00:00:00 2001 From: Manuel Gil Date: Tue, 5 Jan 2021 19:05:52 +0000 Subject: [PATCH] Remove wgpu-subscriber -> subscriber alias in examples --- Cargo.toml | 3 +-- examples/capture/main.rs | 2 +- examples/framework.rs | 2 +- examples/hello-compute/main.rs | 2 +- examples/hello-triangle/main.rs | 2 +- examples/hello-windows/main.rs | 2 +- examples/hello/main.rs | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b47d9743e..d4501b933 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,8 +62,7 @@ noise = "0.6" ddsfile = "0.4" futures = { version = "0.3", default-features = false, features = ["std", "executor"] } -[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.subscriber] -package = "wgpu-subscriber" +[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.wgpu-subscriber] version = "0.1" [[example]] diff --git a/examples/capture/main.rs b/examples/capture/main.rs index 80f96aa21..90e17116a 100644 --- a/examples/capture/main.rs +++ b/examples/capture/main.rs @@ -194,7 +194,7 @@ impl BufferDimensions { fn main() { #[cfg(not(target_arch = "wasm32"))] { - subscriber::initialize_default_subscriber(None); + wgpu_subscriber::initialize_default_subscriber(None); futures::executor::block_on(run("red.png")); } #[cfg(target_arch = "wasm32")] diff --git a/examples/framework.rs b/examples/framework.rs index 8a50567cc..745610360 100644 --- a/examples/framework.rs +++ b/examples/framework.rs @@ -75,7 +75,7 @@ async fn setup(title: &str) -> Setup { #[cfg(not(target_arch = "wasm32"))] { let chrome_tracing_dir = std::env::var("WGPU_CHROME_TRACE"); - subscriber::initialize_default_subscriber( + wgpu_subscriber::initialize_default_subscriber( chrome_tracing_dir.as_ref().map(std::path::Path::new).ok(), ); }; diff --git a/examples/hello-compute/main.rs b/examples/hello-compute/main.rs index 962b8c257..df532782d 100644 --- a/examples/hello-compute/main.rs +++ b/examples/hello-compute/main.rs @@ -182,7 +182,7 @@ async fn execute_gpu(numbers: Vec) -> Vec { fn main() { #[cfg(not(target_arch = "wasm32"))] { - subscriber::initialize_default_subscriber(None); + wgpu_subscriber::initialize_default_subscriber(None); futures::executor::block_on(run()); } #[cfg(target_arch = "wasm32")] diff --git a/examples/hello-triangle/main.rs b/examples/hello-triangle/main.rs index 97a917dbf..c9daeee93 100644 --- a/examples/hello-triangle/main.rs +++ b/examples/hello-triangle/main.rs @@ -138,7 +138,7 @@ fn main() { let window = winit::window::Window::new(&event_loop).unwrap(); #[cfg(not(target_arch = "wasm32"))] { - subscriber::initialize_default_subscriber(None); + wgpu_subscriber::initialize_default_subscriber(None); // Temporarily avoid srgb formats for the swapchain on the web futures::executor::block_on(run(event_loop, window)); } diff --git a/examples/hello-windows/main.rs b/examples/hello-windows/main.rs index 70c849be5..08e8f0e41 100644 --- a/examples/hello-windows/main.rs +++ b/examples/hello-windows/main.rs @@ -189,7 +189,7 @@ fn main() { } } - subscriber::initialize_default_subscriber(None); + wgpu_subscriber::initialize_default_subscriber(None); // Temporarily avoid srgb formats for the swapchain on the web futures::executor::block_on(run(event_loop, viewports)); } diff --git a/examples/hello/main.rs b/examples/hello/main.rs index faeee7520..a58e56873 100644 --- a/examples/hello/main.rs +++ b/examples/hello/main.rs @@ -13,7 +13,7 @@ async fn run() { fn main() { #[cfg(not(target_arch = "wasm32"))] { - subscriber::initialize_default_subscriber(None); + wgpu_subscriber::initialize_default_subscriber(None); futures::executor::block_on(run()); } #[cfg(target_arch = "wasm32")]