Skip to content

update assert-json-diff and thiserror major versions #4148

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update assert-json-diff and thiserror major versions #4148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
79 changes: 31 additions & 48 deletions rust-runtime/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust-runtime/aws-smithy-http-server-python/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pyo3 = "0.18.2"
pyo3-asyncio = { version = "0.18.0", features = ["tokio-runtime"] }
signal-hook = { version = "0.3.14", features = ["extended-siginfo"] }
socket2 = { version = "0.5.5", features = ["all"] }
thiserror = "1.0.40"
thiserror = "2"
tokio = { version = "1.40.0", features = ["full"] }
tokio-stream = "0.1.2"
tower = { version = "0.4.13", features = ["util"] }
Expand Down
2 changes: 1 addition & 1 deletion rust-runtime/aws-smithy-http-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ nom = "7.1.3"
pin-project-lite = "0.2.14"
regex = "1.11.1"
serde_urlencoded = "0.7"
thiserror = "1.0.40"
thiserror = "2"
tokio = { version = "1.40.0", features = ["full"] }
tower = { version = "0.4.13", features = ["util", "make"], default-features = false }
tower-http = { version = "0.3", features = ["add-extension", "map-response-body"] }
Expand Down
4 changes: 2 additions & 2 deletions rust-runtime/aws-smithy-protocol-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = "https://github.com/smithy-lang/smithy-rs"

[dependencies]
# Not perfect for our needs, but good for now
assert-json-diff = "1.1"
assert-json-diff = "2"
base64-simd = "0.8"
cbor-diag = "0.1.12"
ciborium = "0.2"
Expand All @@ -18,7 +18,7 @@ pretty_assertions = "1.3"
regex-lite = "0.1.5"
roxmltree = "0.14.1"
serde_json = "1.0.128"
thiserror = "1.0.40"
thiserror = "2"
aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["client"] }

[package.metadata.docs.rs]
Expand Down
5 changes: 3 additions & 2 deletions rust-runtime/aws-smithy-protocol-test/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ mod xml;

use crate::sealed::GetNormalizedHeader;
use crate::xml::try_xml_equivalent;
use assert_json_diff::assert_json_eq_no_panic;
use assert_json_diff::assert_json_matches_no_panic;
use aws_smithy_runtime_api::client::orchestrator::HttpRequest;
use aws_smithy_runtime_api::http::Headers;
use http::{HeaderMap, Uri};
Expand Down Expand Up @@ -406,7 +406,8 @@ fn try_json_eq(expected: &str, actual: &str) -> Result<(), ProtocolTestFailure>
expected: "json".to_owned(),
found: e.to_string() + actual,
})?;
match assert_json_eq_no_panic(&actual_json, &expected_json) {
let config = assert_json_diff::Config::new(assert_json_diff::CompareMode::Strict);
match assert_json_matches_no_panic(&actual_json, &expected_json, config) {
Ok(()) => Ok(()),
Err(message) => Err(ProtocolTestFailure::BodyDidNotMatch {
comparison: pretty_comparison(expected, actual),
Expand Down