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

build(deps): upgrade multiple dependencies #476

Merged
merged 10 commits into from
Oct 19, 2024
1,166 changes: 579 additions & 587 deletions Cargo.lock

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ members = [
"packages/mrml-wasm",
]
resolver = "2"

[workspace.dependencies]
similar-asserts = { version = "1.6" }
18 changes: 9 additions & 9 deletions examples/axum/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
axum = { version = "0.7.4", features = ["macros"] }
axum = { version = "0.7", features = ["macros"] }
mrml = { version = "*", path = "../../packages/mrml-core", features = [
"async",
"http-loader-async-reqwest",
"async",
"http-loader-async-reqwest",
] }
serde = { version = "1.0.197", features = ["derive"] }
tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread"] }
tracing = { version = "0.1.40" }
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
serde = { version = "1.0", features = ["derive"] }
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
tracing = { version = "0.1" }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[dev-dependencies]
serde_json = { version = "1.0.114" }
tower = { version = "0.4.13" }
serde_json = { version = "1.0" }
tower = { version = "0.5", features = ["util"] }
2 changes: 1 addition & 1 deletion examples/axum/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ mod tests {
http::{self, Request, StatusCode},
};
use serde_json::json;
use tower::ServiceExt;
use tower::util::ServiceExt;

#[tokio::test]
async fn should_parse_and_render() {
Expand Down
16 changes: 8 additions & 8 deletions packages/mrml-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,28 @@ async-trait = { version = "0.1", optional = true }
serde = { version = "1.0", optional = true, features = ["derive"] }
serde_json = { version = "1.0", optional = true }
xmlparser = { version = "0.13", optional = true }
indexmap = { version = "2.0", default-features = false }
indexmap = { version = "2.6", default-features = false }
rustc-hash = { version = "2.0", default-features = false }
thiserror = { version = "1.0", optional = true }

# http-loader feature related
reqwest = { version = "0.12", default-features = false, features = [
"rustls-tls",
], optional = true }
ureq = { version = "2.7", optional = true }
url = { version = "^2", optional = true }
ureq = { version = "2.10", optional = true }
url = { version = "2.5", optional = true }

# macros
itertools = { version = "0.13.0" }
enum_dispatch = { version = "0.3.13", optional = true }
enum-as-inner = { version = "0.6.0", optional = true }
itertools = { version = "0.13" }
enum_dispatch = { version = "0.3", optional = true }
enum-as-inner = { version = "0.6", optional = true }

[dev-dependencies]
concat-idents = "1.1"
criterion = "0.5"
html-compare = { version = "0.1", path = "./lib/html-compare" }
similar-asserts = "1.4"
mockito = "1.1"
similar-asserts = { workspace = true }
mockito = "1.5"
tokio = { version = "1.0", features = ["full"] }
tokio-test = { version = "0.4" }

Expand Down
6 changes: 3 additions & 3 deletions packages/mrml-core/lib/css-compare/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ repository = "https://github.com/jdrouet/mrml"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
lightningcss = { version = "1.0.0-alpha.55", features = [
"grid",
lightningcss = { version = "1.0.0-alpha.59", features = [
"grid",
], default-features = false }

[dev-dependencies]
similar-asserts = { version = "1.4" }
similar-asserts = { workspace = true }
2 changes: 1 addition & 1 deletion packages/mrml-core/lib/html-compare/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ repository = "https://github.com/jdrouet/mrml"
[dependencies]
colored = "2.0"
css-compare = { path = "../css-compare", version = "0.1" }
similar-asserts = "1.4"
similar-asserts = { workspace = true }
htmlparser = "0.1"
6 changes: 3 additions & 3 deletions packages/mrml-python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ crate-type = ["cdylib"]

[dependencies]
mrml = { version = "4.0.1", path = "../mrml-core", features = [
"http-loader-ureq",
"local-loader",
"http-loader-ureq",
"local-loader",
] }
pyo3 = { version = "0.21.2", features = ["extension-module"] }
pyo3 = { version = "0.22", features = ["extension-module"] }
4 changes: 2 additions & 2 deletions packages/mrml-python/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ pub struct MemoryIncludeLoaderOptions(HashMap<String, String>);
#[derive(Clone, Debug, Default)]
pub struct LocalIncludeLoaderOptions(PathBuf);

#[pyclass]
#[derive(Clone, Debug)]
#[pyclass(eq, eq_int)]
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum HttpIncludeLoaderOptionsMode {
Allow,
Deny,
Expand Down
4 changes: 4 additions & 0 deletions packages/mrml-wasm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ impl From<ToHtmlResult> for JsValue {

#[cfg(test)]
mod tests {
#![allow(dead_code)]

use std::collections::HashMap;
use std::iter::FromIterator;

Expand Down Expand Up @@ -192,6 +194,8 @@ mod tests {

#[cfg(all(test, feature = "async"))]
mod async_tests {
#![allow(dead_code)]

use std::collections::HashMap;
use std::iter::FromIterator;

Expand Down
Loading