Merging upstream version 1.71.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 46 insertions, 11 deletions

diff --git a/vendor/similar/Cargo.toml b/vendor/similar/Cargo.toml
index 5f94e2f04..82938ded8 100644
--- a/vendor/similar/Cargo.toml
+++ b/vendor/similar/Cargo.toml
@@ -11,23 +11,39 @@
 
 [package]
 edition = "2018"
+rust-version = "1.41"
 name = "similar"
-version = "2.1.0"
-authors = ["Armin Ronacher <armin.ronacher@active-4.com>", "Pierre-Étienne Meunier <pe@pijul.org>", "Brandon Williams <bwilliams.eng@gmail.com>"]
+version = "2.2.1"
+authors = [
+    "Armin Ronacher <armin.ronacher@active-4.com>",
+    "Pierre-Étienne Meunier <pe@pijul.org>",
+    "Brandon Williams <bwilliams.eng@gmail.com>",
+]
 exclude = ["assets/*"]
 description = "A diff library for Rust"
 readme = "README.md"
-keywords = ["diff", "difference", "patience", "compare", "changes"]
+keywords = [
+    "diff",
+    "difference",
+    "patience",
+    "compare",
+    "changes",
+]
 license = "Apache-2.0"
 repository = "https://github.com/mitsuhiko/similar"
+
 [package.metadata.docs.rs]
 all-features = true
+
 [profile.release]
 debug = true
 
 [[example]]
 name = "patience"
-required-features = ["text", "inline"]
+required-features = [
+    "text",
+    "inline",
+]
 
 [[example]]
 name = "terminal"
@@ -35,7 +51,11 @@ required-features = ["text"]
 
 [[example]]
 name = "terminal-inline"
-required-features = ["text", "inline", "bytes"]
+required-features = [
+    "text",
+    "inline",
+    "bytes",
+]
 
 [[example]]
 name = "original-slices"
@@ -43,7 +63,10 @@ required-features = ["text"]
 
 [[example]]
 name = "udiff"
-required-features = ["text", "bytes"]
+required-features = [
+    "text",
+    "bytes",
+]
 
 [[example]]
 name = "close-matches"
@@ -55,7 +78,11 @@ required-features = ["text"]
 
 [[example]]
 name = "serde"
-required-features = ["text", "serde"]
+required-features = [
+    "text",
+    "serde",
+]
+
 [dependencies.bstr]
 version = "0.2.14"
 optional = true
@@ -69,18 +96,26 @@ optional = true
 [dependencies.unicode-segmentation]
 version = "1.7.1"
 optional = true
+
 [dev-dependencies.console]
-version = "0.14.0"
+version = "0.15.0"
 
 [dev-dependencies.insta]
-version = "1.6.2"
+version = "1.10.0"
 
 [dev-dependencies.serde_json]
 version = "1.0.68"
 
 [features]
-bytes = ["bstr", "text"]
+bytes = [
+    "bstr",
+    "text",
+]
 default = ["text"]
 inline = ["text"]
 text = []
-unicode = ["text", "unicode-segmentation", "bstr/unicode"]
+unicode = [
+    "text",
+    "unicode-segmentation",
+    "bstr/unicode",
+]