Skip to content

Commit

Permalink
Replace deprecated test-env-log by test-log
Browse files Browse the repository at this point in the history
The CI doesn't pass otherwise.
  • Loading branch information
CryZe committed Nov 22, 2021
1 parent 9e9007b commit db7faff
Show file tree
Hide file tree
Showing 22 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion druid-shell/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ features = ["Window", "MouseEvent", "CssStyleDeclaration", "WheelEvent", "KeyEve
[dev-dependencies]
piet-common = { version = "=0.5.0", features = ["png"] }
static_assertions = "1.1.0"
test-env-log = { version = "0.2.5", features = ["trace"], default-features = false }
test-log = { version = "0.2.8", features = ["trace"], default-features = false }
tracing-subscriber = "0.2.15"
unicode-segmentation = "1.7.0"

Expand Down
2 changes: 1 addition & 1 deletion druid-shell/src/backend/mac/menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ impl HotKey {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

#[test]
fn strip_access() {
Expand Down
2 changes: 1 addition & 1 deletion druid-shell/src/backend/mac/screen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ mod test {
use crate::backend::mac::screen::transform_coords;
use crate::Monitor;
use kurbo::Rect;
use test_env_log::test;
use test_log::test;

fn pair(rect: Rect) -> (Rect, Rect) {
(rect, rect)
Expand Down
2 changes: 1 addition & 1 deletion druid-shell/src/backend/windows/keycodes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ map_keys! {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

#[test]
fn win_vk() {
Expand Down
4 changes: 2 additions & 2 deletions druid/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ float-cmp = { version = "0.8.0", features = ["std"], default-features = false }
tempfile = "=3.1.0"
piet-common = { version = "=0.5.0", features = ["png"] }
pulldown-cmark = { version = "0.8", default-features = false }
test-env-log = { version = "0.2.5", features = ["trace"], default-features = false }
# test-env-log needs it
test-log = { version = "0.2.8", features = ["trace"], default-features = false }
# test-log needs it
tracing-subscriber = { version = "0.2.15", features = ["env-filter"] }

[target.'cfg(not(target_arch="wasm32"))'.dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion druid/src/bloom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ impl<T: ?Sized> Default for Bloom<T> {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

#[test]
fn very_good_test() {
Expand Down
2 changes: 1 addition & 1 deletion druid/src/box_constraints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ impl BoxConstraints {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

fn bc(min_width: f64, min_height: f64, max_width: f64, max_height: f64) -> BoxConstraints {
BoxConstraints::new(
Expand Down
2 changes: 1 addition & 1 deletion druid/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ impl std::fmt::Debug for Notification {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

#[test]
fn get_payload() {
Expand Down
2 changes: 1 addition & 1 deletion druid/src/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,7 @@ mod tests {
use crate::widget::{Button, Flex, Scroll, Split, TextBox};
use crate::{WidgetExt, WindowHandle, WindowId};
use std::collections::HashMap;
use test_env_log::test;
use test_log::test;

const ID_1: WidgetId = WidgetId::reserved(0);
const ID_2: WidgetId = WidgetId::reserved(1);
Expand Down
2 changes: 1 addition & 1 deletion druid/src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ impl<T: Data, const N: usize> Data for [T; N] {
#[cfg(test)]
mod test {
use super::Data;
use test_env_log::test;
use test_log::test;

#[test]
fn array_data() {
Expand Down
2 changes: 1 addition & 1 deletion druid/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ impl From<(f64, f64, f64, f64)> for KeyOrValue<Insets> {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

#[test]
fn string_key_or_value() {
Expand Down
2 changes: 1 addition & 1 deletion druid/src/localization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ impl<'a, T: std::fmt::Display> std::fmt::Display for PrintLocales<'a, T> {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

#[test]
fn resolve() {
Expand Down
2 changes: 1 addition & 1 deletion druid/src/tests/invalidation_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//! Tests related to propagation of invalid rects.

use float_cmp::approx_eq;
use test_env_log::test;
use test_log::test;

use super::*;

Expand Down
2 changes: 1 addition & 1 deletion druid/src/tests/layout_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//! Tests related to layout.

use float_cmp::approx_eq;
use test_env_log::test;
use test_log::test;

use super::*;

Expand Down
2 changes: 1 addition & 1 deletion druid/src/text/attribute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ impl<T> Default for SpanSet<T> {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

#[test]
fn smoke_test_spans() {
Expand Down
2 changes: 1 addition & 1 deletion druid/src/text/editable_text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ pub fn len_utf8_from_first_byte(b: u8) -> usize {
mod tests {
use super::*;
use crate::Data;
use test_env_log::test;
use test_log::test;

#[test]
fn replace() {
Expand Down
2 changes: 1 addition & 1 deletion druid/src/widget/clip_box.rs
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ impl<T: Data, W: Widget<T>> Widget<T> for ClipBox<T, W> {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

#[test]
fn pan_to_visible() {
Expand Down
2 changes: 1 addition & 1 deletion druid/src/widget/flex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ impl<T> Child<T> {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

#[test]
#[allow(clippy::cognitive_complexity)]
Expand Down
2 changes: 1 addition & 1 deletion druid/src/widget/image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ impl<T: Data> Widget<T> for Image {
mod tests {
use super::*;
use crate::piet::ImageFormat;
use test_env_log::test;
use test_log::test;

/// Painting an empty image shouldn't crash druid.
#[test]
Expand Down
2 changes: 1 addition & 1 deletion druid/src/widget/sized_box.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ impl<T: Data> Widget<T> for SizedBox<T> {
mod tests {
use super::*;
use crate::widget::Label;
use test_env_log::test;
use test_log::test;

#[test]
fn expand() {
Expand Down
2 changes: 1 addition & 1 deletion druid/src/widget/svg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ fn color_from_svg(c: usvg::Color, opacity: usvg::Opacity) -> Color {
#[cfg(test)]
mod tests {
use super::*;
use test_env_log::test;
use test_log::test;

#[test]
fn usvg_transform_vs_affine() {
Expand Down
2 changes: 1 addition & 1 deletion druid/src/widget/widget_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ mod tests {
use super::*;
use crate::widget::Slider;
use crate::Color;
use test_env_log::test;
use test_log::test;

#[test]
fn container_reuse() {
Expand Down

0 comments on commit db7faff

Please sign in to comment.