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

Clean up features #1001

Closed
wants to merge 2 commits into from
Closed

Clean up features #1001

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef22698
Use `dep:` prefix to suppress implicit features
Kijewski Apr 6, 2024
17a5e00
Remove deprecated, no-op features
Kijewski Apr 6, 2024
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
16 changes: 8 additions & 8 deletions askama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ maintenance = { status = "actively-developed" }
[features]
default = ["config", "humansize", "num-traits", "urlencode"]
config = ["askama_derive/config"]
humansize = ["askama_derive/humansize", "dep_humansize"]
markdown = ["askama_derive/markdown", "comrak"]
num-traits = ["askama_derive/num-traits", "dep_num_traits"]
serde-json = ["askama_derive/serde-json", "askama_escape/json", "serde", "serde_json"]
serde-yaml = ["askama_derive/serde-yaml", "serde", "serde_yaml"]
urlencode = ["askama_derive/urlencode", "percent-encoding"]
humansize = ["askama_derive/humansize", "dep:humansize"]
markdown = ["askama_derive/markdown", "dep:comrak"]
num-traits = ["askama_derive/num-traits", "dep:num-traits"]
serde-json = ["askama_derive/serde-json", "askama_escape/json", "dep:serde", "dep:serde_json"]
Copy link
Collaborator

Choose a reason for hiding this comment

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

For serde_json I think we should prefer the upstream spelling for the feature, now that we can do this. Maybe keep serde-json around as an alias (but change any mentions in documentation to the underscore variant)?

serde-yaml = ["askama_derive/serde-yaml", "dep:serde", "dep:serde_yaml"]
urlencode = ["askama_derive/urlencode", "dep:percent-encoding"]
with-actix-web = ["askama_derive/with-actix-web"]
with-axum = ["askama_derive/with-axum"]
with-rocket = ["askama_derive/with-rocket"]
Expand All @@ -38,8 +38,8 @@ mime_guess = []
askama_derive = { version = "0.13", path = "../askama_derive" }
askama_escape = { version = "0.10.3", path = "../askama_escape" }
comrak = { version = "0.22", optional = true, default-features = false }
dep_humansize = { package = "humansize", version = "2", optional = true }
dep_num_traits = { package = "num-traits", version = "0.2.6", optional = true }
humansize = { version = "2", optional = true }
num-traits = { version = "0.2.6", optional = true }
percent-encoding = { version = "2.1.0", optional = true }
serde = { version = "1.0", optional = true, features = ["derive"] }
serde_json = { version = "1.0", optional = true }
Expand Down
16 changes: 8 additions & 8 deletions askama/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ pub enum Error {
Custom(Box<dyn std::error::Error + Send + Sync>),

/// json conversion error
#[cfg(feature = "serde_json")]
#[cfg(feature = "serde-json")]
Json(::serde_json::Error),

/// yaml conversion error
#[cfg(feature = "serde_yaml")]
#[cfg(feature = "serde-yaml")]
Yaml(::serde_yaml::Error),
}

Expand All @@ -45,9 +45,9 @@ impl std::error::Error for Error {
match *self {
Error::Fmt(ref err) => Some(err),
Error::Custom(ref err) => Some(err.as_ref()),
#[cfg(feature = "serde_json")]
#[cfg(feature = "serde-json")]
Error::Json(ref err) => Some(err),
#[cfg(feature = "serde_yaml")]
#[cfg(feature = "serde-yaml")]
Error::Yaml(ref err) => Some(err),
}
}
Expand All @@ -58,9 +58,9 @@ impl Display for Error {
match self {
Error::Fmt(err) => write!(formatter, "formatting error: {err}"),
Error::Custom(err) => write!(formatter, "{err}"),
#[cfg(feature = "serde_json")]
#[cfg(feature = "serde-json")]
Error::Json(err) => write!(formatter, "json conversion error: {err}"),
#[cfg(feature = "serde_yaml")]
#[cfg(feature = "serde-yaml")]
Error::Yaml(err) => write!(formatter, "yaml conversion error: {}", err),
}
}
Expand All @@ -72,14 +72,14 @@ impl From<fmt::Error> for Error {
}
}

#[cfg(feature = "serde_json")]
#[cfg(feature = "serde-json")]
impl From<::serde_json::Error> for Error {
fn from(err: ::serde_json::Error) -> Self {
Error::Json(err)
}
}

#[cfg(feature = "serde_yaml")]
#[cfg(feature = "serde-yaml")]
impl From<::serde_yaml::Error> for Error {
fn from(err: ::serde_yaml::Error) -> Self {
Error::Yaml(err)
Expand Down
4 changes: 2 additions & 2 deletions askama/src/filters/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ pub use self::yaml::yaml;
use crate::error::Error::Fmt;
use askama_escape::{Escaper, MarkupDisplay};
#[cfg(feature = "humansize")]
use dep_humansize::{format_size_i, ToF64, DECIMAL};
use humansize::{format_size_i, ToF64, DECIMAL};
#[cfg(feature = "num-traits")]
use dep_num_traits::{cast::NumCast, Signed};
use num_traits::{cast::NumCast, Signed};
#[cfg(feature = "percent-encoding")]
use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};

Expand Down