rwf2/Rocket
1
0
Fork 0
mirror of https://github.com/rwf2/Rocket.git synced 2025-02-07 09:12:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make '<String as FromParam>::Error' 'Infallible'.

Browse Source 
Fixes #1679.
This commit is contained in:
PROgrm_JARvis 2021-06-11 17:42:04 +03:00 committed by Sergio Benitez
parent dc1b729f29
commit 4339c2af48
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/codegen/tests/typed-uris.rs
View File

@ -427,7 +427,7 @@ struct Third<'r> {
#[post("/<foo>/<bar>?<q1>&<rest..>")] #[post("/<foo>/<bar>?<q1>&<rest..>")]
fn optionals( fn optionals(
foo: Option<usize>, foo: Option<usize>,
bar: Result<String, &'_ str>, bar: Option<String>,
q1: Result<usize, Errors<'_>>, q1: Result<usize, Errors<'_>>,
rest: Option<Third<'_>> rest: Option<Third<'_>>
) { } ) { }

2
core/lib/src/request/from_param.rs
View File

@ -193,7 +193,7 @@ impl<'a> FromParam<'a> for &'a str {
} }
impl<'a> FromParam<'a> for String { impl<'a> FromParam<'a> for String {
type Error = &'a str; type Error = std::convert::Infallible;
#[inline(always)] #[inline(always)]
fn from_param(param: &'a str) -> Result<String, Self::Error> { fn from_param(param: &'a str) -> Result<String, Self::Error> {