rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Touchup of field length validation error messagtes; add special case for fixed length fields and change the phrasing when a length has a lower bound only.

This commit is contained in:
Jan Danielsson 2023-12-01 16:26:40 +01:00
parent 7f7d352e45
commit 0c78040ade
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/lib/src/form/error.rs
View File

@ -817,8 +817,15 @@ impl fmt::Display for ErrorKind<'_> {
(None, Some(k)) if *k < 1024 => write!(f, "length cannot exceed {}", k)?,
(None, Some(k)) => write!(f, "size must not exceed {}", ByteUnit::from(*k))?,
(Some(1), None) => write!(f, "cannot be empty")?,
(Some(k), None) if *k < 1024 => write!(f, "expected at least {}", k)?,
(Some(k), None) if *k < 1024 => write!(f, "length expected to be at least {}", k)?,
(Some(k), None) => write!(f, "size must be at least {}", ByteUnit::from(*k))?,
(Some(i), Some(j)) if *i == *j && *i < 1024 => {
write!(f, "length must be {}", i)?;
}
(Some(i), Some(j)) if *i == *j => {
let i = ByteUnit::from(*i);
write!(f, "length must be {}", i)?;
}
(Some(i), Some(j)) if *i < 1024 && *j < 1024 => {
write!(f, "length must be between {} and {}", i, j)?;
}