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.

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

Rename extension traits for Cookies and QueryString #218

Merged
merged 2 commits into from
May 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/cookies.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![feature(async_await)]

use cookie::Cookie;
use tide::{cookies::CookiesExt, middleware::CookiesMiddleware, Context};
use tide::{cookies::ContextExt, middleware::CookiesMiddleware, Context};

/// Tide will use the the `Cookies`'s `Extract` implementation to build this parameter.
///
Expand Down
4 changes: 2 additions & 2 deletions src/cookies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ impl CookieData {
}

/// An extension to `Context` that provides cached access to cookies
pub trait CookiesExt {
pub trait ContextExt {
/// returns a `Cookie` by name of the cookie
fn get_cookie(&mut self, name: &str) -> Result<Option<Cookie<'static>>, StringError>;

Expand All @@ -40,7 +40,7 @@ pub trait CookiesExt {
fn remove_cookie(&mut self, cookie: Cookie<'static>) -> Result<(), StringError>;
}

impl<State> CookiesExt for Context<State> {
impl<State> ContextExt for Context<State> {
fn get_cookie(&mut self, name: &str) -> Result<Option<Cookie<'static>>, StringError> {
let cookie_data = self
.extensions()
Expand Down
4 changes: 2 additions & 2 deletions src/middleware/cookies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{

/// Middleware to work with cookies.
///
/// [`CookiesMiddleware`] along with [`CookiesExt`](crate::cookies::CookiesExt) provide smooth
/// [`CookiesMiddleware`] along with [`ContextExt`](crate::cookies::ContextExt) provide smooth
/// access to request cookies and setting/removing cookies from response. This leverages the
/// [cookie](https://crates.io/crates/cookie) crate.
/// This middleware parses cookies from request and caches them in the extension. Once the request
Expand Down Expand Up @@ -63,7 +63,7 @@ impl<Data: Send + Sync + 'static> Middleware<Data> for CookiesMiddleware {
#[cfg(test)]
mod tests {
use super::*;
use crate::{cookies::CookiesExt, Context};
use crate::{cookies::ContextExt, Context};
use cookie::Cookie;
use futures::executor::block_on;
use http_service::Body;
Expand Down
4 changes: 2 additions & 2 deletions src/querystring.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ use http::StatusCode;
use serde::Deserialize;

/// An extension trait for `Context`, providing query string deserialization.
pub trait ExtractQuery<'de> {
pub trait ContextExt<'de> {
fn url_query<T: Deserialize<'de>>(&'de self) -> Result<T, Error>;
}

impl<'de, Data> ExtractQuery<'de> for Context<Data> {
impl<'de, Data> ContextExt<'de> for Context<Data> {
#[inline]
fn url_query<T: Deserialize<'de>>(&'de self) -> Result<T, Error> {
let query = self.uri().query();
Expand Down