CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to insta and cargo-insta are documented here.
 
+## 1.14.1
+
+- Update uuid crate to 1.0.0. (#228)
+- Use inline block format also for strings of form `"foo\n"`. (#225)
+
 ## 1.14.0
 
 - Fixed a bug that caused insta to panic if inline snapshot assertions

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "insta"
-version = "1.14.0"
+version = "1.14.1"
 license = "Apache-2.0"
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
 description = "A snapshot testing library for Rust"

cargo-insta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-insta"
-version = "1.14.0"
+version = "1.14.1"
 license = "Apache-2.0"
 authors = ["Armin Ronacher <armin.ronacher@active-4.com>"]
 description = "A review tool for the insta snapshot testing library for Rust"
@@ -12,12 +12,12 @@ edition = "2018"
 readme = "README.md"
 
 [dependencies]
-insta = { version = "1.14.0", path = "..", features = ["redactions"] }
+insta = { version = "1.14.1", path = "..", features = ["redactions"] }
 console = "0.15.0"
 structopt = "0.3.20"
 serde = { version = "1.0.117", features = ["derive"] }
 serde_json = "1.0.59"
 proc-macro2 = { version = "1.0.24", features = ["span-locations"] }
 syn = { version = "1.0.50", features = ["full", "visit", "extra-traits"] }
 ignore = "0.4.17"
-uuid = { version = "0.8.1", features = ["v4"] }
+uuid = { version = "1.0.0", features = ["v4"] }

src/snapshot.rs

@@ -317,12 +317,12 @@ impl SnapshotContents {
     pub fn to_inline(&self, indentation: usize) -> String {
         let contents = &self.0;
         let mut out = String::new();
-        let is_escape = contents.lines().count() > 1 || contents.contains(&['\\', '"'][..]);
+        let is_escape = contents.contains(&['\n', '\\', '"'][..]);
 
         out.push_str(if is_escape { "r###\"" } else { "\"" });
         // if we have more than one line we want to change into the block
         // representation mode
-        if contents.lines().count() > 1 {
+        if contents.contains('\n') {
             out.extend(
                 contents
                     .lines()
@@ -512,6 +512,16 @@ b"[1..];
 \"###"
     );
 
+    let t = &"
+    ab
+"[1..];
+    assert_eq!(
+        SnapshotContents(t.to_string()).to_inline(0),
+        "r###\"
+    ab
+\"###"
+    );
+
     let t = "ab";
     assert_eq!(SnapshotContents(t.to_string()).to_inline(0), r##""ab""##);
 }