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

Moved Features into derive #662

Merged
merged 3 commits into from
Apr 6, 2022
Merged

Moved Features into derive #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e78d3b
Moved Features into derive, Updated Askama versions to 0.11
genusistimelord Apr 4, 2022
142c2ae
Lock minimal versions to 0.11.2
genusistimelord Apr 6, 2022
7fc8c7e
Update askama-warp to minimal 0.11.2
genusistimelord Apr 6, 2022
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
28 changes: 14 additions & 14 deletions askama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ maintenance = { status = "actively-developed" }

[features]
default = ["config", "humansize", "num-traits", "urlencode"]
config = ["askama_shared/config"]
humansize = ["askama_shared/humansize"]
markdown = ["askama_shared/markdown"]
urlencode = ["askama_shared/percent-encoding"]
serde-json = ["askama_shared/json"]
serde-yaml = ["askama_shared/yaml"]
num-traits = ["askama_shared/num-traits"]
with-actix-web = ["askama_shared/actix-web"]
with-axum = ["askama_shared/axum"]
with-gotham = ["askama_shared/gotham"]
with-mendes = ["askama_shared/mendes"]
with-rocket = ["askama_shared/rocket"]
with-tide = ["askama_shared/tide"]
with-warp = ["askama_shared/warp"]
config = ["askama_derive/config", "askama_shared/config"]
humansize = ["askama_derive/humansize", "askama_shared/humansize"]
markdown = ["askama_derive/markdown", "askama_shared/markdown"]
urlencode = ["askama_derive/urlencode", "askama_shared/percent-encoding"]
serde-json = ["askama_derive/serde-json", "askama_shared/json"]
serde-yaml = ["askama_derive/serde-yaml", "askama_shared/yaml"]
num-traits = ["askama_derive/num-traits", "askama_shared/num-traits"]
with-actix-web = ["askama_derive/with-actix-web", "askama_shared/actix-web"]
with-axum = ["askama_derive/with-axum", "askama_shared/axum"]
with-gotham = ["askama_derive/with-gotham", "askama_shared/gotham"]
with-mendes = ["askama_derive/with-mendes", "askama_shared/mendes"]
with-rocket = ["askama_derive/with-rocket", "askama_shared/rocket"]
with-tide = ["askama_derive/with-tide", "askama_shared/tide"]
with-warp = ["askama_derive/with-warp", "askama_shared/warp"]

# deprecated
mime = []
Expand Down
2 changes: 1 addition & 1 deletion askama_axum/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = ".."
readme = "README.md"

[dependencies]
askama = { version = "0.11.0", path = "../askama", default-features = false, features = ["with-axum", "mime", "mime_guess"] }
askama = { version = "0.11.2", path = "../askama", default-features = false, features = ["with-axum", "mime", "mime_guess"] }
axum-core = "0.2"
http = "0.2"

Expand Down
16 changes: 16 additions & 0 deletions askama_derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,21 @@ edition = "2018"
[lib]
proc-macro = true

[features]
config = ["askama_shared/config"]
humansize = ["askama_shared/humansize"]
markdown = ["askama_shared/markdown"]
urlencode = ["askama_shared/percent-encoding"]
serde-json = ["askama_shared/json"]
serde-yaml = ["askama_shared/yaml"]
num-traits = ["askama_shared/num-traits"]
with-actix-web = ["askama_shared/actix-web"]
with-axum = ["askama_shared/axum"]
with-gotham = ["askama_shared/gotham"]
with-mendes = ["askama_shared/mendes"]
with-rocket = ["askama_shared/rocket"]
with-tide = ["askama_shared/tide"]
with-warp = ["askama_shared/warp"]

[dependencies]
askama_shared = { version = "0.13.0", path = "../askama_shared", default-features = false }
2 changes: 1 addition & 1 deletion askama_gotham/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readme = "README.md"
edition = "2018"

[dependencies]
askama = { version = "0.11.0", path = "../askama", default-features = false, features = ["with-gotham", "mime", "mime_guess"] }
askama = { version = "0.11.2", path = "../askama", default-features = false, features = ["with-gotham", "mime", "mime_guess"] }
gotham = { version = "0.7", default-features = false }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion askama_mendes/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readme = "README.md"
edition = "2018"

[dependencies]
askama = { version = "0.11.0-beta.1", path = "../askama", default-features = false, features = ["with-mendes", "mime", "mime_guess"] }
askama = { version = "0.11.2", path = "../askama", default-features = false, features = ["with-mendes", "mime", "mime_guess"] }
mendes = "0.0.63"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion askama_rocket/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ readme = "README.md"
edition = "2018"

[dependencies]
askama = { version = "0.11.0-beta.1", path = "../askama", default-features = false, features = ["with-rocket", "mime", "mime_guess"] }
askama = { version = "0.11.2", path = "../askama", default-features = false, features = ["with-rocket", "mime", "mime_guess"] }
rocket = { version = "0.4", default-features = false }
2 changes: 1 addition & 1 deletion askama_tide/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ workspace = ".."
readme = "README.md"

[dependencies]
askama = { version = "0.11.0", path = "../askama", default-features = false, features = ["with-tide"] }
askama = { version = "0.11.2", path = "../askama", default-features = false, features = ["with-tide"] }
tide = { version = "0.16", default-features = false }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion askama_warp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readme = "README.md"
edition = "2018"

[dependencies]
askama = { version = "0.11.0", path = "../askama", default-features = false, features = ["with-warp", "mime", "mime_guess"] }
askama = { version = "0.11.2", path = "../askama", default-features = false, features = ["with-warp", "mime", "mime_guess"] }
warp = { version = "0.3", default-features = false }

[dev-dependencies]
Expand Down