s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into x11kb

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-10-03 12:34:38 +00:00
parent e6c136918c 24adba44be
commit 20c44476a3
12 changed files with 191 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/data.rs
View File

@ -743,8 +743,7 @@ fn extract_symbol_names<'a>(actions: &'a [(&str, action::Action)])
#[cfg(test)]
mod tests {
use super::*;
use std::error::Error as ErrorTrait;
use ::logging::ProblemPanic;
const THIS_FILE: &str = file!();
@ -792,7 +791,8 @@ mod tests {
Err(e) => {
let mut handled = false;
if let Error::Yaml(ye) = &e {
handled = ye.description() == "missing field `views`";
handled = ye.to_string()
.starts_with("missing field `views`");
};
if !handled {
println!("Unexpected error {:?}", e);
@ -810,7 +810,7 @@ mod tests {
Err(e) => {
let mut handled = false;
if let Error::Yaml(ye) = &e {
handled = ye.description()
handled = ye.to_string()
.starts_with("unknown field `bad_field`");
};
if !handled {