Merge pull request #8226 from rust-lang/renovate/insta-1.x

Update Rust crate insta to v1.36.1

Author: Turbo87

Cargo.lock

@@ -130,6 +130,6 @@ crates_io_tarball = { path = "crates_io_tarball", features = ["builder"] }
 crates_io_test_db = { path = "crates_io_test_db" }
 claims = "=0.7.1"
 googletest = "=0.11.0"
-insta = { version = "=1.35.1", features = ["json", "redactions"] }
+insta = { version = "=1.36.1", features = ["json", "redactions"] }
 regex = "=1.10.3"
 tokio = "=1.36.0"

Cargo.toml

@@ -23,7 +23,7 @@ tracing = "=0.1.40"
 claims = "=0.7.1"
 clap = { version = "=4.5.1", features = ["derive"] }
 criterion = { version = "=0.5.1", features = ["async_tokio"] }
-insta = "=1.35.1"
+insta = "=1.36.1"
 tokio = { version = "=1.36.0", features = ["fs", "macros", "rt", "rt-multi-thread"] }
 tracing-subscriber = { version = "=0.3.18", features = ["env-filter"] }
 

crates_io_cdn_logs/Cargo.toml

@@ -125,7 +125,7 @@ mod tests {
     use super::*;
     use crate::test_utils::*;
     use claims::{assert_err, assert_ok};
-    use insta::{assert_debug_snapshot, assert_display_snapshot};
+    use insta::{assert_debug_snapshot, assert_snapshot};
     use std::io::Cursor;
 
     #[tokio::test]
@@ -217,6 +217,6 @@ mod tests {
         ));
         let error = assert_err!(count_downloads(&mut cursor).await);
 
-        assert_display_snapshot!(error, @"Unsupported version: 2.0");
+        assert_snapshot!(error, @"Unsupported version: 2.0");
     }
 }

crates_io_cdn_logs/src/cloudfront.rs

@@ -48,7 +48,7 @@ mod tests {
     use crate::compression::Decompressor;
     use crate::test_utils::*;
     use claims::{assert_err, assert_ok};
-    use insta::{assert_debug_snapshot, assert_display_snapshot};
+    use insta::{assert_debug_snapshot, assert_snapshot};
     use std::io::Cursor;
 
     #[tokio::test]
@@ -199,6 +199,6 @@ mod tests {
 
         let mut cursor = Cursor::new(b"foo");
         let error = assert_err!(count_downloads(&mut cursor).await);
-        assert_display_snapshot!(error, @"Failed to determine log file format. Unrecognized first byte: 102.");
+        assert_snapshot!(error, @"Failed to determine log file format. Unrecognized first byte: 102.");
     }
 }

crates_io_cdn_logs/src/lib.rs

@@ -19,4 +19,4 @@ htmlescape = "=0.3.1"
 url = "=2.5.0"
 
 [dev-dependencies]
-insta = "=1.35.1"
+insta = "=1.36.1"

crates_io_markdown/Cargo.toml

@@ -2,7 +2,7 @@ use crate::builders::CrateBuilder;
 use crate::util::{RequestHelper, TestApp};
 use googletest::prelude::*;
 use http::StatusCode;
-use insta::assert_display_snapshot;
+use insta::assert_snapshot;
 
 fn assert_is_following(crate_name: &str, expected: bool, user: &impl RequestHelper) {
     let response = user.get::<()>(&format!("/api/v1/crates/{crate_name}/following"));
@@ -34,15 +34,15 @@ fn test_unauthenticated_requests() {
 
     let response = anon.get::<()>(&format!("/api/v1/crates/{CRATE_NAME}/following"));
     assert_eq!(response.status(), StatusCode::FORBIDDEN);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"must be logged in to perform that action"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"must be logged in to perform that action"}]}"###);
 
     let response = anon.put::<()>(&format!("/api/v1/crates/{CRATE_NAME}/follow"), b"" as &[u8]);
     assert_eq!(response.status(), StatusCode::FORBIDDEN);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"must be logged in to perform that action"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"must be logged in to perform that action"}]}"###);
 
     let response = anon.delete::<()>(&format!("/api/v1/crates/{CRATE_NAME}/follow"));
     assert_eq!(response.status(), StatusCode::FORBIDDEN);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"must be logged in to perform that action"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"must be logged in to perform that action"}]}"###);
 }
 
 #[test]
@@ -84,15 +84,15 @@ fn test_unknown_crate() {
 
     let response = user.get::<()>("/api/v1/crates/unknown-crate/following");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown-crate` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown-crate` does not exist"}]}"###);
 
     let response = user.put::<()>("/api/v1/crates/unknown-crate/follow", b"" as &[u8]);
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown-crate` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown-crate` does not exist"}]}"###);
 
     let response = user.delete::<()>("/api/v1/crates/unknown-crate/follow");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown-crate` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown-crate` does not exist"}]}"###);
 }
 
 #[test]

src/tests/krate/following.rs

@@ -2,7 +2,7 @@ use crate::builders::{CrateBuilder, DependencyBuilder, PublishBuilder};
 use crate::util::{RequestHelper, TestApp};
 use googletest::prelude::*;
 use http::StatusCode;
-use insta::{assert_display_snapshot, assert_json_snapshot};
+use insta::{assert_json_snapshot, assert_snapshot};
 
 #[test]
 fn invalid_dependency_name() {
@@ -330,7 +330,7 @@ fn test_dep_limit() {
 
     let response = token.publish_crate(crate_to_publish);
     assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crates.io only allows a maximum number of 1 dependencies.\n\nIf you have a use case that requires an increase of this limit, please send us an email to help@crates.io to discuss the details."}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crates.io only allows a maximum number of 1 dependencies.\n\nIf you have a use case that requires an increase of this limit, please send us an email to help@crates.io to discuss the details."}]}"###);
 
     let crate_to_publish =
         PublishBuilder::new("foo", "1.0.0").dependency(DependencyBuilder::new("dep-a"));

src/tests/krate/publish/dependencies.rs

@@ -16,7 +16,7 @@ use crates_io::{
 use chrono::{Duration, Utc};
 use diesel::prelude::*;
 use http::StatusCode;
-use insta::assert_display_snapshot;
+use insta::assert_snapshot;
 
 #[derive(Deserialize)]
 struct TeamResponse {
@@ -336,15 +336,15 @@ fn test_unknown_crate() {
 
     let response = user.get::<()>("/api/v1/crates/unknown/owners");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
 
     let response = user.get::<()>("/api/v1/crates/unknown/owner_team");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
 
     let response = user.get::<()>("/api/v1/crates/unknown/owner_user");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
 }
 
 #[test]

src/tests/owners.rs

@@ -3,7 +3,7 @@ use crate::util::{MockAnonymousUser, RequestHelper, TestApp};
 use chrono::{Duration, Utc};
 use crates_io::views::EncodableVersionDownload;
 use http::StatusCode;
-use insta::{assert_display_snapshot, assert_json_snapshot};
+use insta::{assert_json_snapshot, assert_snapshot};
 
 #[derive(Deserialize)]
 struct Downloads {
@@ -131,7 +131,7 @@ fn test_crate_downloads() {
     // check different crate name
     let response = anon.get::<()>("/api/v1/crates/bar/downloads");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(
+    assert_snapshot!(
         response.text(),
         @r###"{"errors":[{"detail":"crate `bar` does not exist"}]}"###
     );
@@ -170,7 +170,7 @@ fn test_version_downloads() {
     // check different crate name
     let response = anon.get::<()>("/api/v1/crates/bar/1.0.0/downloads");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(
+    assert_snapshot!(
         response.text(),
         @r###"{"errors":[{"detail":"crate `bar` does not exist"}]}"###
     );
@@ -183,15 +183,15 @@ fn test_version_downloads() {
     // check missing version
     let response = anon.get::<()>("/api/v1/crates/foo/2.0.0/downloads");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(
+    assert_snapshot!(
         response.text(),
         @r###"{"errors":[{"detail":"crate `foo` does not have a version `2.0.0`"}]}"###
     );
 
     // check invalid version
     let response = anon.get::<()>("/api/v1/crates/foo/invalid-version/downloads");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(
+    assert_snapshot!(
         response.text(),
         @r###"{"errors":[{"detail":"crate `foo` does not have a version `invalid-version`"}]}"###
     );

src/tests/routes/crates/downloads.rs

@@ -3,7 +3,7 @@ use crate::owners::expire_invitation;
 use crate::util::{RequestHelper, TestApp};
 use crates_io::models::token::{CrateScope, EndpointScope};
 use http::StatusCode;
-use insta::assert_display_snapshot;
+use insta::assert_snapshot;
 
 // This is testing Cargo functionality! ! !
 // specifically functions modify_owners and add_owners
@@ -209,7 +209,7 @@ fn test_owner_change_with_legacy_field() {
     let input = r#"{"users": ["user2"]}"#;
     let response = user1.put::<()>("/api/v1/crates/foo/owners", input.as_bytes());
     assert_eq!(response.status(), StatusCode::OK);
-    assert_display_snapshot!(response.text(), @r###"{"msg":"user user2 has been invited to be an owner of crate foo","ok":true}"###);
+    assert_snapshot!(response.text(), @r###"{"msg":"user user2 has been invited to be an owner of crate foo","ok":true}"###);
 }
 
 #[test]
@@ -222,19 +222,19 @@ fn test_owner_change_with_invalid_json() {
     let input = r#"{"owners": ["foo", }"#;
     let response = user.put::<()>("/api/v1/crates/foo/owners", input.as_bytes());
     assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to parse the request body as JSON: owners[1]: expected value at line 1 column 20"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to parse the request body as JSON: owners[1]: expected value at line 1 column 20"}]}"###);
 
     // `owners` is not an array
     let input = r#"{"owners": "foo"}"#;
     let response = user.put::<()>("/api/v1/crates/foo/owners", input.as_bytes());
     assert_eq!(response.status(), StatusCode::UNPROCESSABLE_ENTITY);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to deserialize the JSON body into the target type: owners: invalid type: string \"foo\", expected a sequence at line 1 column 16"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to deserialize the JSON body into the target type: owners: invalid type: string \"foo\", expected a sequence at line 1 column 16"}]}"###);
 
     // missing `owners` and/or `users` fields
     let input = r#"{}"#;
     let response = user.put::<()>("/api/v1/crates/foo/owners", input.as_bytes());
     assert_eq!(response.status(), StatusCode::UNPROCESSABLE_ENTITY);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to deserialize the JSON body into the target type: missing field `owners` at line 1 column 2"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to deserialize the JSON body into the target type: missing field `owners` at line 1 column 2"}]}"###);
 }
 
 #[test]
@@ -327,7 +327,7 @@ fn test_unknown_crate() {
 
     let response = user.put::<()>("/api/v1/crates/unknown/owners", body);
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
 }
 
 #[test]
@@ -339,7 +339,7 @@ fn test_unknown_user() {
     let body = serde_json::to_vec(&json!({ "owners": ["unknown"] })).unwrap();
     let response = cookie.put::<()>("/api/v1/crates/foo/owners", body);
     assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"could not find user with login `unknown`"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"could not find user with login `unknown`"}]}"###);
 }
 
 #[test]
@@ -351,5 +351,5 @@ fn test_unknown_team() {
     let body = serde_json::to_vec(&json!({ "owners": ["github:unknown:unknown"] })).unwrap();
     let response = cookie.put::<()>("/api/v1/crates/foo/owners", body);
     assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"could not find the github team unknown/unknown"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"could not find the github team unknown/unknown"}]}"###);
 }

src/tests/routes/crates/owners/add.rs

@@ -1,7 +1,7 @@
 use crate::builders::CrateBuilder;
 use crate::util::{RequestHelper, TestApp};
 use http::StatusCode;
-use insta::assert_display_snapshot;
+use insta::assert_snapshot;
 
 #[test]
 fn test_owner_change_with_invalid_json() {
@@ -13,19 +13,19 @@ fn test_owner_change_with_invalid_json() {
     let input = r#"{"owners": ["foo", }"#;
     let response = user.delete_with_body::<()>("/api/v1/crates/foo/owners", input.as_bytes());
     assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to parse the request body as JSON: owners[1]: expected value at line 1 column 20"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to parse the request body as JSON: owners[1]: expected value at line 1 column 20"}]}"###);
 
     // `owners` is not an array
     let input = r#"{"owners": "foo"}"#;
     let response = user.delete_with_body::<()>("/api/v1/crates/foo/owners", input.as_bytes());
     assert_eq!(response.status(), StatusCode::UNPROCESSABLE_ENTITY);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to deserialize the JSON body into the target type: owners: invalid type: string \"foo\", expected a sequence at line 1 column 16"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to deserialize the JSON body into the target type: owners: invalid type: string \"foo\", expected a sequence at line 1 column 16"}]}"###);
 
     // missing `owners` and/or `users` fields
     let input = r#"{}"#;
     let response = user.delete_with_body::<()>("/api/v1/crates/foo/owners", input.as_bytes());
     assert_eq!(response.status(), StatusCode::UNPROCESSABLE_ENTITY);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to deserialize the JSON body into the target type: missing field `owners` at line 1 column 2"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"Failed to deserialize the JSON body into the target type: missing field `owners` at line 1 column 2"}]}"###);
 }
 
 #[test]
@@ -38,7 +38,7 @@ fn test_unknown_crate() {
 
     let response = user.delete_with_body::<()>("/api/v1/crates/unknown/owners", body);
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
 }
 
 #[test]
@@ -50,7 +50,7 @@ fn test_unknown_user() {
     let body = serde_json::to_vec(&json!({ "owners": ["unknown"] })).unwrap();
     let response = cookie.delete_with_body::<()>("/api/v1/crates/foo/owners", body);
     assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"could not find user with login `unknown`"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"could not find user with login `unknown`"}]}"###);
 }
 
 #[test]
@@ -62,5 +62,5 @@ fn test_unknown_team() {
     let body = serde_json::to_vec(&json!({ "owners": ["github:unknown:unknown"] })).unwrap();
     let response = cookie.delete_with_body::<()>("/api/v1/crates/foo/owners", body);
     assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"could not find team with login `github:unknown:unknown`"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"could not find team with login `github:unknown:unknown`"}]}"###);
 }

src/tests/routes/crates/owners/remove.rs

@@ -2,7 +2,7 @@ use crate::builders::{CrateBuilder, PublishBuilder, VersionBuilder};
 use crate::util::{RequestHelper, TestApp};
 use diesel::prelude::*;
 use http::StatusCode;
-use insta::{assert_display_snapshot, assert_json_snapshot};
+use insta::{assert_json_snapshot, assert_snapshot};
 
 #[test]
 fn show() {
@@ -81,7 +81,7 @@ fn test_missing() {
 
     let response = anon.get::<()>("/api/v1/crates/missing");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `missing` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `missing` does not exist"}]}"###);
 }
 
 #[test]

src/tests/routes/crates/read.rs

@@ -1,7 +1,7 @@
 use crate::builders::{CrateBuilder, VersionBuilder};
 use crate::util::{RequestHelper, TestApp};
 use http::StatusCode;
-use insta::{assert_display_snapshot, assert_json_snapshot};
+use insta::{assert_json_snapshot, assert_snapshot};
 
 #[test]
 fn reverse_dependencies() {
@@ -216,5 +216,5 @@ fn test_unknown_crate() {
 
     let response = anon.get::<()>("/api/v1/crates/unknown/reverse_dependencies");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
 }

src/tests/routes/crates/reverse_dependencies.rs

@@ -5,7 +5,7 @@ use crates_io::views::EncodableVersion;
 use diesel::{prelude::*, update};
 use googletest::prelude::*;
 use http::StatusCode;
-use insta::{assert_display_snapshot, assert_json_snapshot};
+use insta::{assert_json_snapshot, assert_snapshot};
 
 #[test]
 fn versions() {
@@ -41,7 +41,7 @@ fn test_unknown_crate() {
 
     let response = anon.get::<()>("/api/v1/crates/unknown/versions");
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
-    assert_display_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
+    assert_snapshot!(response.text(), @r###"{"errors":[{"detail":"crate `unknown` does not exist"}]}"###);
 }
 
 #[test]