Skip to content

Commit b42f468

Browse files
committed
Auto merge of #2659 - oli-obk:ui_test_bump, r=RalfJung
Bump ui test
2 parents 0004a4f + d52586d commit b42f468

File tree

3 files changed

+59
-65
lines changed

3 files changed

+59
-65
lines changed

Cargo.lock

Lines changed: 55 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ libloading = "0.7"
4040

4141
[dev-dependencies]
4242
colored = "2"
43-
ui_test = "0.3.1"
43+
ui_test = "0.4"
4444
rustc_version = "0.4"
4545
# Features chosen to match those required by env_logger, to avoid rebuilds
4646
regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }

tests/compiletest.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use colored::*;
2-
use regex::Regex;
2+
use regex::bytes::Regex;
33
use std::path::{Path, PathBuf};
44
use std::{env, process::Command};
55
use ui_test::{color_eyre::Result, Config, Mode, OutputConflictHandling};
@@ -129,8 +129,8 @@ fn run_tests(mode: Mode, path: &str, target: &str, with_dependencies: bool) -> R
129129

130130
macro_rules! regexes {
131131
($name:ident: $($regex:expr => $replacement:expr,)*) => {lazy_static::lazy_static! {
132-
static ref $name: Vec<(Regex, &'static str)> = vec![
133-
$((Regex::new($regex).unwrap(), $replacement),)*
132+
static ref $name: Vec<(Regex, &'static [u8])> = vec![
133+
$((Regex::new($regex).unwrap(), $replacement.as_bytes()),)*
134134
];
135135
}};
136136
}

0 commit comments

Comments
 (0)