Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow Error: Into<Infallible> for Route::{layer, route_layer} #948

Merged
merged 4 commits into from
Jun 11, 2022
Merged

Allow Error: Into<Infallible> for Route::{layer, route_layer} #948

merged 4 commits into from
Jun 11, 2022

Conversation

davidpdrsn
Copy link
Member

Fixes #922

Note this is a breaking change so we have to wait until axum 0.6

@davidpdrsn
Allow Error: Into<Infallible> for Route::{layer, route_layer} (#924)
aceceeb 
* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}`

Fixes #922

* changelog
@davidpdrsn
fixup changelog
43102d6
@davidpdrsn davidpdrsn added breaking change A PR that makes a breaking change. A-axum labels Apr 19, 2022
@davidpdrsn davidpdrsn mentioned this pull request Apr 19, 2022
Closed
renancloudwalk
renancloudwalk approved these changes May 1, 2022
View reviewed changes
Copy link

@renancloudwalk renancloudwalk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just confirmed that all examples are working fine with this breaking change:
the output

 ls -d examples/*/ | xargs -I {} bash -c "cd '{}' && cargo check"
 
    Finished dev [unoptimized + debuginfo] target(s) in 0.07s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.07s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s
    Finished dev [unoptimized + debuginfo] target(s) in 0.09s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.05s
    Finished dev [unoptimized + debuginfo] target(s) in 0.06s

@davidpdrsn
Copy link
Member Author

@renancloudwalk thanks but we knew 😊 it breaks if you had .map_err(Into::into).

@davidpdrsn davidpdrsn changed the base branch from main to axum-next June 11, 2022 11:33
@davidpdrsn davidpdrsn merged commit 9ec32a7 into axum-next Jun 11, 2022
@davidpdrsn davidpdrsn deleted the error-into-infallible branch June 11, 2022 11:37
@davidpdrsn davidpdrsn mentioned this pull request Jun 11, 2022
Merged
davidpdrsn added a commit that referenced this pull request Jun 17, 2022
@davidpdrsn
Allow Error: Into<Infallible> for Route::{layer, route_layer} (#948)
5646264 
* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}` (#924)

* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}`

Fixes #922

* changelog

* fixup changelog
davidpdrsn added a commit that referenced this pull request Jun 25, 2022
@davidpdrsn
Allow Error: Into<Infallible> for Route::{layer, route_layer} (#948)
8c01850 
* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}` (#924)

* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}`

Fixes #922

* changelog

* fixup changelog
davidpdrsn added a commit that referenced this pull request Jun 25, 2022
@davidpdrsn
Allow Error: Into<Infallible> for Route::{layer, route_layer} (#948)
7e645d5 
* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}` (#924)

* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}`

Fixes #922

* changelog

* fixup changelog
davidpdrsn added a commit that referenced this pull request Jun 27, 2022
@davidpdrsn
Allow Error: Into<Infallible> for Route::{layer, route_layer} (#948)
6b33e46 
* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}` (#924)

* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}`

Fixes #922

* changelog

* fixup changelog
davidpdrsn added a commit that referenced this pull request Jun 28, 2022
@davidpdrsn
Allow Error: Into<Infallible> for Route::{layer, route_layer} (#948)
e7ebd4f 
* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}` (#924)

* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}`

Fixes #922

* changelog

* fixup changelog
davidpdrsn added a commit that referenced this pull request Jun 28, 2022
@davidpdrsn
Allow Error: Into<Infallible> for Route::{layer, route_layer} (#948)
661473d 
* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}` (#924)

* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}`

Fixes #922

* changelog

* fixup changelog
davidpdrsn added a commit that referenced this pull request Jun 29, 2022
@davidpdrsn @jplatte
Remove trailing slash redirects (#1119)
a4c8204 
* Prepare axum-next branch

* Remove deprecated `extractor_middleware` function (#1077)

* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}` (#948)

* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}` (#924)

* Allow `Error: Into<Infallible>` for `Route::{layer, route_layer}`

Fixes #922

* changelog

* fixup changelog

* Panic on overlapping routes in `MethodRouter` (#1102)

* Panic on overlapping routes in `MethodRouter`

* changelog link

* add test to ensure `head` and `get` don't overlap

* Fix changelog

* Prepare axum-next branch

* Remove trailing slash redirects

* changelog link

* Fix changelog

* remove asserting to make make the test more clear

* remove tsr related feature

* Add `RouterExt::route_with_tsr`

* Apply suggestions from code review

Co-authored-by: Jonas Platte <jplatte+git@posteo.de>

* Update axum-extra/src/routing/mod.rs

Co-authored-by: Jonas Platte <jplatte+git@posteo.de>

* fix typos in docs

* Update axum/CHANGELOG.md

Co-authored-by: Jonas Platte <jplatte+git@posteo.de>

* mention `RouterExt::route_with_tsr` in the changelog

Co-authored-by: Jonas Platte <jplatte+git@posteo.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@renancloudwalk renancloudwalk renancloudwalk approved these changes

@daheige daheige daheige approved these changes

@jplatte jplatte jplatte approved these changes

Assignees
No one assigned
Labels
A-axum breaking change A PR that makes a breaking change.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Router::layer should allow services whose Error: Into<Infallible>
4 participants
@davidpdrsn @jplatte @daheige @renancloudwalk