From 33012346bab87d252c0471f9dd87c5ed1e00e4da Mon Sep 17 00:00:00 2001 From: "J.C. Jones" Date: Tue, 28 Jan 2025 15:18:41 -0700 Subject: [PATCH 1/2] Shorten PR 1533 using std::Cow::Borrowed 1533 got auto-merged too quickly! --- src/entity/task/new_task.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/entity/task/new_task.rs b/src/entity/task/new_task.rs index 57b8e2f2..ddf28531 100644 --- a/src/entity/task/new_task.rs +++ b/src/entity/task/new_task.rs @@ -11,6 +11,7 @@ use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine}; use rand::Rng; use sea_orm::{ColumnTrait, ConnectionTrait, EntityTrait, QueryFilter}; use sha2::{Digest, Sha256}; +use std::Cow::Borrowed; use validator::{ValidationErrors, ValidationErrorsKind}; use vdaf::{DpStrategy, DpStrategyKind, SumVec}; @@ -282,7 +283,7 @@ impl NewTask { Err(e) => { let errors = errors .errors_mut() - .entry(std::borrow::Cow::Borrowed("vdaf")) + .entry(Cow::Borrowed("vdaf")) .or_insert_with(|| { ValidationErrorsKind::Struct(Box::new(ValidationErrors::new())) }); @@ -299,7 +300,7 @@ impl NewTask { if !leader.vdafs.contains(&name) || !helper.vdafs.contains(&name) { let errors = errors .errors_mut() - .entry(std::borrow::Cow::Borrowed("vdaf")) + .entry(Cow::Borrowed("vdaf")) .or_insert_with(|| ValidationErrorsKind::Struct(Box::new(ValidationErrors::new()))); match errors { ValidationErrorsKind::Struct(errors) => { From 070d1a3609c60bd975793d63beed7745d2ee905f Mon Sep 17 00:00:00 2001 From: "J.C. Jones" Date: Tue, 28 Jan 2025 15:37:42 -0700 Subject: [PATCH 2/2] moo --- src/entity/task/new_task.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/entity/task/new_task.rs b/src/entity/task/new_task.rs index ddf28531..a5538230 100644 --- a/src/entity/task/new_task.rs +++ b/src/entity/task/new_task.rs @@ -11,7 +11,7 @@ use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine}; use rand::Rng; use sea_orm::{ColumnTrait, ConnectionTrait, EntityTrait, QueryFilter}; use sha2::{Digest, Sha256}; -use std::Cow::Borrowed; +use std::borrow::Cow; use validator::{ValidationErrors, ValidationErrorsKind}; use vdaf::{DpStrategy, DpStrategyKind, SumVec};