Fix 1.60 lints

This commit is contained in:
Blaž Hrastnik 2022-02-25 13:06:11 +09:00
parent 9712bbb23b
commit b935fac957
No known key found for this signature in database
GPG Key ID: 1238B9C4AD889640
2 changed files with 2 additions and 2 deletions

View File

@ -165,7 +165,7 @@ fn item_to_transaction(
if let Some(additional_edits) = item
.additional_text_edits
.as_ref()
.or_else(|| resolved_additional_text_edits.as_ref())
.or(resolved_additional_text_edits.as_ref())
{
if !additional_edits.is_empty() {
let transaction = util::generate_transaction_from_edits(

View File

@ -490,7 +490,7 @@ fn line_composer_word_wrapper_nbsp() {
assert_eq!(word_wrapper, vec!["AAAAAAAAAAAAAAA", "AAAA\u{00a0}AAA",]);
// Ensure that if the character was a regular space, it would be wrapped differently.
let text_space = text.replace("\u{00a0}", " ");
let text_space = text.replace('\u{00a0}', " ");
let (word_wrapper_space, _) =
run_composer(Composer::WordWrapper { trim: true }, &text_space, width);
assert_eq!(word_wrapper_space, vec!["AAAAAAAAAAAAAAA AAAA", "AAA",]);