diff --git a/crates/color/tests/it/main.rs b/crates/color/tests/it/main.rs index 018507205..377d66d4a 100644 --- a/crates/color/tests/it/main.rs +++ b/crates/color/tests/it/main.rs @@ -1,8 +1,8 @@ //! The screen tests of craft-color, folded into the lib's test target. mod color_parts; -mod pair; mod paint_list; +mod pair; mod panels; mod picker; mod sampling; diff --git a/crates/color/tests/it/panels.rs b/crates/color/tests/it/panels.rs index 93be3c643..f42987910 100644 --- a/crates/color/tests/it/panels.rs +++ b/crates/color/tests/it/panels.rs @@ -145,12 +145,11 @@ fn the_slider_modes_show_a_channel_on_one_line() { assert_eq!((sliders.len(), fields.len()), (channels, channels), "{case}"); for (slider, field) in sliders.iter().zip(&fields) { let line = slider.rect.y_range(); - assert!(line.contains(field.rect.center().y) && slider.rect.right() <= field.rect.left(), "{case}: {slider:?} then {field:?} on one line"); assert!( - (slider.rect.left() - sliders[0].rect.left()).abs() < 0.5, - "{case}: the sliders start at one x ({slider:?}, {:?})", - sliders[0] + line.contains(field.rect.center().y) && slider.rect.right() <= field.rect.left(), + "{case}: {slider:?} then {field:?} on one line" ); + assert!((slider.rect.left() - sliders[0].rect.left()).abs() < 0.5, "{case}: the sliders start at one x ({slider:?}, {:?})", sliders[0]); assert!(field.rect.bottom() <= room.y + 0.5, "{case}: every row in view ({field:?})"); } let last = fields.iter().map(|field| field.rect.bottom()).fold(0.0, f32::max); diff --git a/crates/story-render/src/main.rs b/crates/story-render/src/main.rs index 9e3b57a3e..8c312c5cd 100644 --- a/crates/story-render/src/main.rs +++ b/crates/story-render/src/main.rs @@ -74,8 +74,18 @@ struct Options { fn options() -> Result { let mut args = std::env::args().skip(1); let threads = std::thread::available_parallelism().map_or(1, |n| n.get()).min(8); - let mut options = - Options { out: PathBuf::new(), only: None, story: None, threads, width: WIDTH, room: ROOM, scale: PIXELS_PER_POINT, card: false, theme: String::new(), mode: "dark".to_owned() }; + let mut options = Options { + out: PathBuf::new(), + only: None, + story: None, + threads, + width: WIDTH, + room: ROOM, + scale: PIXELS_PER_POINT, + card: false, + theme: String::new(), + mode: "dark".to_owned(), + }; while let Some(arg) = args.next() { let mut value = || args.next().ok_or_else(|| format!("{arg} needs a value")); match arg.as_str() {