Merge branch 'master' into unify-file-inline-compat

max-sixty · Aug 12, 2024 · 0988509 · 0988509
2 parents 75e512a + 32f75e7
commit 0988509
Show file tree

Hide file tree

Showing 55 changed files with 56 additions and 65 deletions.
diff --git a/insta/src/snapshots/doctest_runtime_rs__named.snap b/insta/src/snapshots/doctest_runtime_rs__named.snap
@@ -1,5 +1,5 @@
 ---
-source: src/runtime.rs
+source: insta/src/runtime.rs
 expression: "vec![1, 2, 3, 4, 5]"
 ---
 [

diff --git a/insta/src/snapshots/insta__test__embedded.snap b/insta/src/snapshots/insta__test__embedded.snap
@@ -1,5 +1,5 @@
 ---
-source: src/test.rs
+source: insta/src/test.rs
 expression: "\"Just a string\""
 ---
 Just a string
diff --git a/insta/tests/snapshots/snapshot_no_module_prepending.snap b/insta/tests/snapshots/snapshot_no_module_prepending.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_settings.rs
+source: insta/tests/test_settings.rs
 expression: "vec![1, 2, 3]"
 ---
 [

diff --git a/insta/tests/snapshots/test_basic__Testing.snap b/insta/tests/snapshots/test_basic__Testing.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: expr
 ---
 name
diff --git a/insta/tests/snapshots/test_basic__debug_vector.snap b/insta/tests/snapshots/test_basic__debug_vector.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3]"
 ---
 [

diff --git a/insta/tests/snapshots/test_basic__display.snap b/insta/tests/snapshots/test_basic__display.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: td
 ---
 TestDisplay struct
diff --git a/insta/tests/snapshots/test_basic__insta_sort_order.snap b/insta/tests/snapshots/test_basic__insta_sort_order.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: m
 ---
 ? - 1
@@ -17,4 +17,3 @@ expression: m
 ? - 9
   - 3
 : 4
-
diff --git a/insta/tests/snapshots/test_basic__json_vector.snap b/insta/tests/snapshots/test_basic__json_vector.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3]"
 ---
 [

diff --git a/insta/tests/snapshots/test_basic__nested__nested_module.snap b/insta/tests/snapshots/test_basic__nested__nested_module.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "\"aoeu\""
 ---
 aoeu
diff --git a/insta/tests/snapshots/test_basic__trailing_commas-2.snap b/insta/tests/snapshots/test_basic__trailing_commas-2.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3, 4, 5]"
 ---
 - 1

diff --git a/insta/tests/snapshots/test_basic__trailing_commas.snap b/insta/tests/snapshots/test_basic__trailing_commas.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "\"Testing\""
 ---
 Testing
diff --git a/insta/tests/snapshots/test_basic__unnamed_debug_vector-2.snap b/insta/tests/snapshots/test_basic__unnamed_debug_vector-2.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3, 4]"
 ---
 [

diff --git a/insta/tests/snapshots/test_basic__unnamed_debug_vector-3.snap b/insta/tests/snapshots/test_basic__unnamed_debug_vector-3.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3, 4, 5]"
 ---
 [

diff --git a/insta/tests/snapshots/test_basic__unnamed_debug_vector.snap b/insta/tests/snapshots/test_basic__unnamed_debug_vector.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3]"
 ---
 [

diff --git a/insta/tests/snapshots/test_basic__unnamed_display-2.snap b/insta/tests/snapshots/test_basic__unnamed_display-2.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "\"whatever\""
 ---
 whatever
diff --git a/insta/tests/snapshots/test_basic__unnamed_display.snap b/insta/tests/snapshots/test_basic__unnamed_display.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: td
 ---
 TestDisplay struct
diff --git a/insta/tests/snapshots/test_basic__unnamed_json_vector-2.snap b/insta/tests/snapshots/test_basic__unnamed_json_vector-2.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3, 4]"
 ---
 [

diff --git a/insta/tests/snapshots/test_basic__unnamed_json_vector-3.snap b/insta/tests/snapshots/test_basic__unnamed_json_vector-3.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3, 4, 5]"
 ---
 [

diff --git a/insta/tests/snapshots/test_basic__unnamed_json_vector.snap b/insta/tests/snapshots/test_basic__unnamed_json_vector.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3]"
 ---
 [

diff --git a/insta/tests/snapshots/test_basic__unnamed_nested_closure.snap b/insta/tests/snapshots/test_basic__unnamed_nested_closure.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3]"
 ---
 [

diff --git a/insta/tests/snapshots/test_basic__unnamed_yaml_vector-2.snap b/insta/tests/snapshots/test_basic__unnamed_yaml_vector-2.snap
@@ -1,9 +1,8 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3, 4]"
 ---
 - 1
 - 2
 - 3
 - 4
-
diff --git a/insta/tests/snapshots/test_basic__unnamed_yaml_vector-3.snap b/insta/tests/snapshots/test_basic__unnamed_yaml_vector-3.snap
@@ -1,10 +1,9 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3, 4, 5]"
 ---
 - 1
 - 2
 - 3
 - 4
 - 5
-
diff --git a/insta/tests/snapshots/test_basic__unnamed_yaml_vector.snap b/insta/tests/snapshots/test_basic__unnamed_yaml_vector.snap
@@ -1,8 +1,7 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3]"
 ---
 - 1
 - 2
 - 3
-
diff --git a/insta/tests/snapshots/test_basic__yaml_vector.snap b/insta/tests/snapshots/test_basic__yaml_vector.snap
@@ -1,8 +1,7 @@
 ---
-source: tests/test_basic.rs
+source: insta/tests/test_basic.rs
 expression: "vec![1, 2, 3]"
 ---
 - 1
 - 2
 - 3
-
diff --git a/insta/tests/snapshots/test_bugs__crlf.snap b/insta/tests/snapshots/test_bugs__crlf.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_bugs.rs
+source: insta/tests/test_bugs.rs
 expression: "\"foo\\r\\nbar\\r\\nbaz\""
 ---
 foo

diff --git a/insta/tests/snapshots/test_bugs__trailing_crlf.snap b/insta/tests/snapshots/test_bugs__trailing_crlf.snap
@@ -1,8 +1,7 @@
 ---
-source: tests/test_bugs.rs
+source: insta/tests/test_bugs.rs
 expression: "\"foo\\r\\nbar\\r\\nbaz\\r\\n\""
 ---
 foo
 bar
 baz
-
diff --git a/insta/tests/snapshots/test_inline__unnamed_thread_single_line-2.snap b/insta/tests/snapshots/test_inline__unnamed_thread_single_line-2.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_inline.rs
+source: insta/tests/test_inline.rs
 expression: "\"Testing-thread-2\""
 ---
 Testing-thread-2
diff --git a/insta/tests/snapshots/test_inline__unnamed_thread_single_line.snap b/insta/tests/snapshots/test_inline__unnamed_thread_single_line.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_inline.rs
+source: insta/tests/test_inline.rs
 expression: "\"Testing-thread\""
 ---
 Testing-thread
diff --git a/insta/tests/snapshots/test_redaction__foo_bar.snap b/insta/tests/snapshots/test_redaction__foo_bar.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "Selector::parse(\".foo.bar\").unwrap()"
 ---
 Selector {

diff --git a/insta/tests/snapshots/test_redaction__foo_bar_alt.snap b/insta/tests/snapshots/test_redaction__foo_bar_alt.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "Selector::parse(\".foo[\\\"bar\\\"]\").unwrap()"
 ---
 Selector {

diff --git a/insta/tests/snapshots/test_redaction__foo_bar_deep.snap b/insta/tests/snapshots/test_redaction__foo_bar_deep.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "Selector::parse(\".foo.bar.**\").unwrap()"
 ---
 Selector {

diff --git a/insta/tests/snapshots/test_redaction__foo_bar_full_range.snap b/insta/tests/snapshots/test_redaction__foo_bar_full_range.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "Selector::parse(\".foo.bar[]\").unwrap()"
 ---
 Selector {

diff --git a/insta/tests/snapshots/test_redaction__foo_bar_range.snap b/insta/tests/snapshots/test_redaction__foo_bar_range.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "Selector::parse(\".foo.bar[10:20]\").unwrap()"
 ---
 Selector {

diff --git a/insta/tests/snapshots/test_redaction__foo_bar_range_from.snap b/insta/tests/snapshots/test_redaction__foo_bar_range_from.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "Selector::parse(\".foo.bar[10:]\").unwrap()"
 ---
 Selector {

diff --git a/insta/tests/snapshots/test_redaction__foo_bar_range_to.snap b/insta/tests/snapshots/test_redaction__foo_bar_range_to.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "Selector::parse(\".foo.bar[:10]\").unwrap()"
 ---
 Selector {

diff --git a/insta/tests/snapshots/test_redaction__map_key_redaction.snap b/insta/tests/snapshots/test_redaction__map_key_redaction.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: foo_value
 ---
 hm:
@@ -8,4 +8,3 @@ hm:
   : 42
 btm:
   "[key]": 23
-
diff --git a/insta/tests/snapshots/test_redaction__rounded_redaction.snap b/insta/tests/snapshots/test_redaction__rounded_redaction.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "&MyPoint { x: 1.0 / 3.0, y: 6.0 / 3.0 }"
 ---
 {

diff --git a/insta/tests/snapshots/test_redaction__struct_array_redaction.snap b/insta/tests/snapshots/test_redaction__struct_array_redaction.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "vec![checkout]"
 ---
 - _id: "[checkout_id]"
@@ -8,4 +8,3 @@ expression: "vec![checkout]"
       product_name: "[product_name]"
     - _id: "[product_id]"
       product_name: "[product_name]"
-
diff --git a/insta/tests/snapshots/test_redaction__user.snap b/insta/tests/snapshots/test_redaction__user.snap
@@ -1,9 +1,8 @@
 ---
-source: tests/test_redaction.rs
-expression: "&User {\n        id: 23,\n        username: \"john_doe\".to_string(),\n        email: Email(\"[email protected]\".to_string()),\n        extra: \"\".to_string(),\n    }"
+source: insta/tests/test_redaction.rs
+expression: "&User {\n        id: 11,\n        username: \"john_doe\".to_string(),\n        email: Email(\"[email protected]\".to_string()),\n        extra: \"\".to_string(),\n    }"
 ---
 id: "[id]"
 username: john_doe
 email: john@example.com
 extra: ""
-
diff --git a/insta/tests/snapshots/test_redaction__user_json.snap b/insta/tests/snapshots/test_redaction__user_json.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "&User {\n        id: 9999,\n        username: \"jason_doe\".to_string(),\n        email: Email(\"[email protected]\".to_string()),\n        extra: \"ssn goes here\".to_string(),\n    }"
 ---
 {

diff --git a/insta/tests/snapshots/test_redaction__user_json_flags.snap b/insta/tests/snapshots/test_redaction__user_json_flags.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "&User {\n        id: 122,\n        username: \"jason_doe\".to_string(),\n        flags: vec![\"zzz\".into(), \"foo\".into(), \"aha\".into(),\n                    \"is_admin\".into()].into_iter().collect(),\n    }"
 ---
 {

diff --git a/insta/tests/snapshots/test_redaction__user_json_flags_alt.snap b/insta/tests/snapshots/test_redaction__user_json_flags_alt.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "&User {\n        id: 122,\n        username: \"jason_doe\".to_string(),\n        flags: MySet(vec![\"zzz\".into(), \"foo\".into(), \"aha\".into(),\n                        \"is_admin\".into()].into_iter().collect()),\n    }"
 ---
 {

diff --git a/insta/tests/snapshots/test_redaction__user_json_settings.snap b/insta/tests/snapshots/test_redaction__user_json_settings.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "&User {\n        id: 122,\n        username: \"jason_doe\".to_string(),\n        email: Email(\"[email protected]\".to_string()),\n        extra: \"ssn goes here\".to_string(),\n    }"
 ---
 {

diff --git a/insta/tests/snapshots/test_redaction__user_json_settings_callback.snap b/insta/tests/snapshots/test_redaction__user_json_settings_callback.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "&User {\n        id: 1234,\n        username: \"jason_doe\".to_string(),\n        email: Email(\"[email protected]\".to_string()),\n        extra: \"extra here\".to_string(),\n    }"
 ---
 {

diff --git a/insta/tests/snapshots/test_redaction__with_random_value_and_match_comma-2.snap b/insta/tests/snapshots/test_redaction__with_random_value_and_match_comma-2.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "&User {\n        id: 11,\n        username: \"john_doe\".to_string(),\n        email: Email(\"[email protected]\".to_string()),\n        extra: \"\".to_string(),\n    }"
 ---
 id: "[id]"

diff --git a/insta/tests/snapshots/test_redaction__with_random_value_and_match_comma.snap b/insta/tests/snapshots/test_redaction__with_random_value_and_match_comma.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "&User {\n        id: 11,\n        username: \"john_doe\".to_string(),\n        email: Email(\"[email protected]\".to_string()),\n        extra: \"\".to_string(),\n    }"
 ---
 id: "[id]"

diff --git a/insta/tests/snapshots/test_redaction__with_random_value_json_match.snap b/insta/tests/snapshots/test_redaction__with_random_value_json_match.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "&User {\n        id: 9999,\n        username: \"jason_doe\".to_string(),\n        email: Email(\"[email protected]\".to_string()),\n        extra: \"ssn goes here\".to_string(),\n    }"
 ---
 {

diff --git a/insta/tests/snapshots/test_redaction__with_random_value_json_settings2.snap b/insta/tests/snapshots/test_redaction__with_random_value_json_settings2.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_redaction.rs
+source: insta/tests/test_redaction.rs
 expression: "&User {\n        id: 975,\n        username: \"jason_doe\".to_string(),\n        email: Email(\"[email protected]\".to_string()),\n        extra: \"ssn goes here\".to_string(),\n    }"
 ---
 {

diff --git a/insta/tests/snapshots/test_settings__snapshot_with_description.snap b/insta/tests/snapshots/test_settings__snapshot_with_description.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_settings.rs
+source: insta/tests/test_settings.rs
 description: The snapshot is three integers
 expression: "vec![1, 2, 3]"
 ---

diff --git a/insta/tests/snapshots/test_settings__snapshot_with_description_and_info.snap b/insta/tests/snapshots/test_settings__snapshot_with_description_and_info.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_settings.rs
+source: insta/tests/test_settings.rs
 description: The snapshot is four integers
 expression: "vec![1, 2, 3, 4]"
 info:

diff --git a/insta/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap b/insta/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap
@@ -1,5 +1,5 @@
 ---
-source: tests/test_settings.rs
+source: insta/tests/test_settings.rs
 description: The snapshot is four integers
 expression: "vec![1, 2, 3, 4]"
 info: