Merging upstream version 1.76.0+dfsg1.

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

5 files changed, 26 insertions, 10 deletions

diff --git a/vendor/bstr/.cargo-checksum.json b/vendor/bstr/.cargo-checksum.json
index 04cad9221..94d8b18f0 100644
--- a/vendor/bstr/.cargo-checksum.json
+++ b/vendor/bstr/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"COPYING":"68653aaa727a2bfa31b7a751e31701ce33c49d695c12dd291a07d1c54da4c14b","Cargo.lock":"c36bf13a0db7e61dafd933b6b6c00ab9937ec0dedd86e258cec9f77398ffe7ed","Cargo.toml":"98e6de7edd0e320aace57321c5ca2527c79ad18d68978fba20e3274dbf6b484d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6b7374c39a57e57fc2c38eb529c4c88340152b10f51dd5ae2d819dfa67f61715","README.md":"5e20af8472e06926761584e3c249ebc8b9802f1eb13440276d9aa267e70e5955","examples/graphemes-std.rs":"100264f623ff973be76831fb1d4519e6f371b21972d6577bb49bf7bbff4d0d5e","examples/graphemes.rs":"401c5fac813f78e4029ece9c98bccb3128637c507d8667b73e069bfbc9d7f2f4","examples/lines-std.rs":"094a48bfd483ec01f80f9c937ddfe6f0bdbf09f960ba822215ec8ed9862624df","examples/lines.rs":"65ae4edbdb0ccff8ff40cdc70b4e7a70824f5028daff2e1b2a3247f884589db8","examples/uppercase-std.rs":"33aed88e38483aa303625757304a974594476a3a659d8bdd4877aceb90ff8be3","examples/uppercase.rs":"2cdf7f173cb6a5d4c16a967e3f733bc40331f5167da519c5194ceee187ff814f","examples/words-std.rs":"ffde2fccd361890fab0e0b051915a749d5d51e95b9be700b76fada231d002f00","examples/words.rs":"aa805faa5012714428ef895596947c333417c2b16a7e0155d4a128be7428fc17","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/ascii.rs":"5aae67428421ad9e2156d7b27f5931bd924056b9af073ec53c44ef8e2d29cc8a","src/bstr.rs":"be1313d13814f3818068f1f6c96e4a1eecf1ecdec42c360f90379596804ea0ef","src/bstring.rs":"1cd7656dc3a6eded742eb7e9e43c83a5d020e6a419060c186788c8e1010f7dcc","src/byteset/mod.rs":"3f88d5594d95724c6eda96f79006a27dab80c4f849f00342b0bae3efedc32c45","src/byteset/scalar.rs":"fb84085b30d2901407877eb306828574eaf0dea907bbb7f02c36f24f0dc6f7b6","src/escape_bytes.rs":"207b7b92398912f940f911cfaafca04b7c62dac1106063ae2c7bd0676238b4cf","src/ext_slice.rs":"e0dff7cf2fa384d9dccf8c720b9867003f258a5dc6011b0debe80d68dae35c1f","src/ext_vec.rs":"4dd9af267c07554051787c752e22e091684eb93f1a70c70ac2537535d1a54a07","src/impls.rs":"cd585f19d96f06b35cb17a7a8479f14f6b624beecf01501ea077f4b8eaacced4","src/io.rs":"73afcb89230d940b17a5917696c3f7c55267aefcb42db4164062dbf18875b677","src/lib.rs":"5e665152491cc9ce3a1f2cee3f235704b49e32017c691b45a371714aa6969d1e","src/tests.rs":"8adfd1a4a9da91b2a4dff25ffafcf99d914be3f5b7d67d66cdcb40a2d72abd04","src/unicode/data/GraphemeBreakTest.txt":"ddc7d4d1f3838573b94fc5d83ff7217e63c47b22ae1cd40c5fe1a54efc15589b","src/unicode/data/LICENSE-UNICODE":"8b9babb256418ec15761d635a49f973424939affba7a0a88de2fc2690e454a23","src/unicode/data/SentenceBreakTest.txt":"7e42dd749dbb94aa44b13faf9df6319d9a16ce2ea09a3a094fcfbb5962168040","src/unicode/data/WordBreakTest.txt":"8094b544ec1580c7e41ac0187805cc1aeb330a90301ec7505563e1a59318284e","src/unicode/fsm/grapheme_break_fwd.bigendian.dfa":"ed5aa2efd017d8815d58ffc1dc65525948f8ed003d81ac891f78ee04181dca81","src/unicode/fsm/grapheme_break_fwd.littleendian.dfa":"31c832b147705f1d144e43d117fdde35092fe569bbe7dcc97e5961fe6860791e","src/unicode/fsm/grapheme_break_fwd.rs":"2b35935d19226ccd10f26633f3c6b6c3fc61bf00fdefd314fe350d3dbb333ee4","src/unicode/fsm/grapheme_break_rev.bigendian.dfa":"ab3b82ed1bbfdbb7d7da178d7ed7f4fd5f66d20dc4688f5643abd89b9b4fe0ea","src/unicode/fsm/grapheme_break_rev.littleendian.dfa":"e30d2863ffa26181d736c3a3e8df9bcad104360bd2eed5bab23473f4ec9287ae","src/unicode/fsm/grapheme_break_rev.rs":"1da158d1f12c6313e227357d00ad56c8718792cd4d2b54ce3fed9446cd4b370e","src/unicode/fsm/mod.rs":"50b8baa692e83f909a0fe62eced9666b712a68b6c7bf42976c8cc37e49dd9b64","src/unicode/fsm/regional_indicator_rev.bigendian.dfa":"97b61dc64bfbf612d5ff5a17b126b9e3afd303fb36f5aa2f4a199b6f3b7cced5","src/unicode/fsm/regional_indicator_rev.littleendian.dfa":"5b0e114dc14d7dc46a8398f98018a630df33ccff8b909ddcd44a0da8d2ad20d1","src/unicode/fsm/regional_indicator_rev.rs":"c973a021197982282dfb12cd918185836795e44914daea19df4b4e4a156ae680","src/unicode/fsm/sentence_break_fwd.bigendian.dfa":"0dd4dfa025a932862e6d04a9fdc0aa25c26ac1d9d1a0baa05651d851c1fa4718","src/unicode/fsm/sentence_break_fwd.littleendian.dfa":"cb37cd218f2714928916640154a0803d257e114271ff0ea90055bc0f4e8a2d41","src/unicode/fsm/sentence_break_fwd.rs":"3e3708f16992e3b157b29304e5dce47fcadbf5db1d0b85828f852fbbb7a9da09","src/unicode/fsm/simple_word_fwd.bigendian.dfa":"27fefb1ab8f0cd6d4d3b877832122c2e35d7921eaf29c0e6de96ff51611b20f8","src/unicode/fsm/simple_word_fwd.littleendian.dfa":"a9340c695ed76aa37353ce8f337e84e08714754b9ccbba64fcfaddb9a32c4e87","src/unicode/fsm/simple_word_fwd.rs":"59b818f24363d622d8a4bf40872e3648b582779861d4ce7a7a0b8a2f2d04d721","src/unicode/fsm/whitespace_anchored_fwd.bigendian.dfa":"9a8886693ceb7616d8838e370e1fe5a2a9aafed50891278f70dd443a5d72e4d4","src/unicode/fsm/whitespace_anchored_fwd.littleendian.dfa":"661745fc2ca838e2ebb10dba01c8dd5cd72b264ef71b2b343196a0bcf5daaac7","src/unicode/fsm/whitespace_anchored_fwd.rs":"77183ab0bc353aa688ca0c829dbef011eeab8b9eff07ef861c92ac905f9d64ba","src/unicode/fsm/whitespace_anchored_rev.bigendian.dfa":"cf5f2fb71f3ea6eb2f6349c039f00d9cc72b9fa949910594c1453c5fa8b2f4da","src/unicode/fsm/whitespace_anchored_rev.littleendian.dfa":"791825312415cbd24aca8b8262ded3e1fabc785e3eba3660f65019296f8e5f58","src/unicode/fsm/whitespace_anchored_rev.rs":"0e98166e69ba84eb7f5e7ce504e4aa8cb9aa3043f7f95629b1432daeb9e55678","src/unicode/fsm/word_break_fwd.bigendian.dfa":"54908d18964ef017b909594af6ce976af9a22698845a858234724e747240462d","src/unicode/fsm/word_break_fwd.littleendian.dfa":"c7977465637868e286fcb818b4cab7349a9c1612f4b0a1d06b0ba5f2d8281018","src/unicode/fsm/word_break_fwd.rs":"ce643936af3b8a8a91b8ee8252f08a080a2041ef6784e7c46ab9b4d5acee463c","src/unicode/grapheme.rs":"a42b8b61c9dfc05c3c15e311bfef7a36f5f4222d9f044d1d990259591a60a103","src/unicode/mod.rs":"fc67b0d64e9395398235c8663706b246edc0742e6cfe87057eeabdb1b19ad28d","src/unicode/sentence.rs":"85bab665e0be53957743211cb4956060b6087716127251a3f962a57e87cd2775","src/unicode/whitespace.rs":"f4961ea2020edb6bb382a56e7ad91ee9b221670842669c5e070f19995840abaa","src/unicode/word.rs":"73eef99becfd0697f55500052df057c45a3aa9393839e67f77dbd227a7ea88f4","src/utf8.rs":"e759713023dc3e5f9f5b2e6c3ba601af591ce5b2ad71aba729e3c29bcf6007e3"},"package":"4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a"}
\ No newline at end of file
+{"files":{"COPYING":"68653aaa727a2bfa31b7a751e31701ce33c49d695c12dd291a07d1c54da4c14b","Cargo.lock":"c4b12f4a563c45d89204855b2e00ea50c8b9f6181dc0e9f41bb196b9b8cc5a76","Cargo.toml":"1c2f0329b877249318d546643ca74dd4aedecae6888c631ea15b14397825f2bd","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6b7374c39a57e57fc2c38eb529c4c88340152b10f51dd5ae2d819dfa67f61715","README.md":"e3833d78fffa45662201f1d5bc563859ee434d2a77d9959f393c46674866a5ee","examples/graphemes-std.rs":"100264f623ff973be76831fb1d4519e6f371b21972d6577bb49bf7bbff4d0d5e","examples/graphemes.rs":"401c5fac813f78e4029ece9c98bccb3128637c507d8667b73e069bfbc9d7f2f4","examples/lines-std.rs":"094a48bfd483ec01f80f9c937ddfe6f0bdbf09f960ba822215ec8ed9862624df","examples/lines.rs":"65ae4edbdb0ccff8ff40cdc70b4e7a70824f5028daff2e1b2a3247f884589db8","examples/uppercase-std.rs":"33aed88e38483aa303625757304a974594476a3a659d8bdd4877aceb90ff8be3","examples/uppercase.rs":"2cdf7f173cb6a5d4c16a967e3f733bc40331f5167da519c5194ceee187ff814f","examples/words-std.rs":"ffde2fccd361890fab0e0b051915a749d5d51e95b9be700b76fada231d002f00","examples/words.rs":"aa805faa5012714428ef895596947c333417c2b16a7e0155d4a128be7428fc17","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/ascii.rs":"5aae67428421ad9e2156d7b27f5931bd924056b9af073ec53c44ef8e2d29cc8a","src/bstr.rs":"be1313d13814f3818068f1f6c96e4a1eecf1ecdec42c360f90379596804ea0ef","src/bstring.rs":"1cd7656dc3a6eded742eb7e9e43c83a5d020e6a419060c186788c8e1010f7dcc","src/byteset/mod.rs":"3f88d5594d95724c6eda96f79006a27dab80c4f849f00342b0bae3efedc32c45","src/byteset/scalar.rs":"fb84085b30d2901407877eb306828574eaf0dea907bbb7f02c36f24f0dc6f7b6","src/escape_bytes.rs":"207b7b92398912f940f911cfaafca04b7c62dac1106063ae2c7bd0676238b4cf","src/ext_slice.rs":"e0dff7cf2fa384d9dccf8c720b9867003f258a5dc6011b0debe80d68dae35c1f","src/ext_vec.rs":"4dd9af267c07554051787c752e22e091684eb93f1a70c70ac2537535d1a54a07","src/impls.rs":"7071731ae5dcb59e85df892f7c70eb1d9380a4907831f5d467f895ecf5d7ef02","src/io.rs":"73afcb89230d940b17a5917696c3f7c55267aefcb42db4164062dbf18875b677","src/lib.rs":"5e665152491cc9ce3a1f2cee3f235704b49e32017c691b45a371714aa6969d1e","src/tests.rs":"8adfd1a4a9da91b2a4dff25ffafcf99d914be3f5b7d67d66cdcb40a2d72abd04","src/unicode/data/GraphemeBreakTest.txt":"ddc7d4d1f3838573b94fc5d83ff7217e63c47b22ae1cd40c5fe1a54efc15589b","src/unicode/data/LICENSE-UNICODE":"8b9babb256418ec15761d635a49f973424939affba7a0a88de2fc2690e454a23","src/unicode/data/SentenceBreakTest.txt":"7e42dd749dbb94aa44b13faf9df6319d9a16ce2ea09a3a094fcfbb5962168040","src/unicode/data/WordBreakTest.txt":"8094b544ec1580c7e41ac0187805cc1aeb330a90301ec7505563e1a59318284e","src/unicode/fsm/grapheme_break_fwd.bigendian.dfa":"ed5aa2efd017d8815d58ffc1dc65525948f8ed003d81ac891f78ee04181dca81","src/unicode/fsm/grapheme_break_fwd.littleendian.dfa":"31c832b147705f1d144e43d117fdde35092fe569bbe7dcc97e5961fe6860791e","src/unicode/fsm/grapheme_break_fwd.rs":"2b35935d19226ccd10f26633f3c6b6c3fc61bf00fdefd314fe350d3dbb333ee4","src/unicode/fsm/grapheme_break_rev.bigendian.dfa":"ab3b82ed1bbfdbb7d7da178d7ed7f4fd5f66d20dc4688f5643abd89b9b4fe0ea","src/unicode/fsm/grapheme_break_rev.littleendian.dfa":"e30d2863ffa26181d736c3a3e8df9bcad104360bd2eed5bab23473f4ec9287ae","src/unicode/fsm/grapheme_break_rev.rs":"1da158d1f12c6313e227357d00ad56c8718792cd4d2b54ce3fed9446cd4b370e","src/unicode/fsm/mod.rs":"50b8baa692e83f909a0fe62eced9666b712a68b6c7bf42976c8cc37e49dd9b64","src/unicode/fsm/regional_indicator_rev.bigendian.dfa":"97b61dc64bfbf612d5ff5a17b126b9e3afd303fb36f5aa2f4a199b6f3b7cced5","src/unicode/fsm/regional_indicator_rev.littleendian.dfa":"5b0e114dc14d7dc46a8398f98018a630df33ccff8b909ddcd44a0da8d2ad20d1","src/unicode/fsm/regional_indicator_rev.rs":"c973a021197982282dfb12cd918185836795e44914daea19df4b4e4a156ae680","src/unicode/fsm/sentence_break_fwd.bigendian.dfa":"0dd4dfa025a932862e6d04a9fdc0aa25c26ac1d9d1a0baa05651d851c1fa4718","src/unicode/fsm/sentence_break_fwd.littleendian.dfa":"cb37cd218f2714928916640154a0803d257e114271ff0ea90055bc0f4e8a2d41","src/unicode/fsm/sentence_break_fwd.rs":"3e3708f16992e3b157b29304e5dce47fcadbf5db1d0b85828f852fbbb7a9da09","src/unicode/fsm/simple_word_fwd.bigendian.dfa":"27fefb1ab8f0cd6d4d3b877832122c2e35d7921eaf29c0e6de96ff51611b20f8","src/unicode/fsm/simple_word_fwd.littleendian.dfa":"a9340c695ed76aa37353ce8f337e84e08714754b9ccbba64fcfaddb9a32c4e87","src/unicode/fsm/simple_word_fwd.rs":"59b818f24363d622d8a4bf40872e3648b582779861d4ce7a7a0b8a2f2d04d721","src/unicode/fsm/whitespace_anchored_fwd.bigendian.dfa":"9a8886693ceb7616d8838e370e1fe5a2a9aafed50891278f70dd443a5d72e4d4","src/unicode/fsm/whitespace_anchored_fwd.littleendian.dfa":"661745fc2ca838e2ebb10dba01c8dd5cd72b264ef71b2b343196a0bcf5daaac7","src/unicode/fsm/whitespace_anchored_fwd.rs":"77183ab0bc353aa688ca0c829dbef011eeab8b9eff07ef861c92ac905f9d64ba","src/unicode/fsm/whitespace_anchored_rev.bigendian.dfa":"cf5f2fb71f3ea6eb2f6349c039f00d9cc72b9fa949910594c1453c5fa8b2f4da","src/unicode/fsm/whitespace_anchored_rev.littleendian.dfa":"791825312415cbd24aca8b8262ded3e1fabc785e3eba3660f65019296f8e5f58","src/unicode/fsm/whitespace_anchored_rev.rs":"0e98166e69ba84eb7f5e7ce504e4aa8cb9aa3043f7f95629b1432daeb9e55678","src/unicode/fsm/word_break_fwd.bigendian.dfa":"54908d18964ef017b909594af6ce976af9a22698845a858234724e747240462d","src/unicode/fsm/word_break_fwd.littleendian.dfa":"c7977465637868e286fcb818b4cab7349a9c1612f4b0a1d06b0ba5f2d8281018","src/unicode/fsm/word_break_fwd.rs":"ce643936af3b8a8a91b8ee8252f08a080a2041ef6784e7c46ab9b4d5acee463c","src/unicode/grapheme.rs":"a42b8b61c9dfc05c3c15e311bfef7a36f5f4222d9f044d1d990259591a60a103","src/unicode/mod.rs":"fc67b0d64e9395398235c8663706b246edc0742e6cfe87057eeabdb1b19ad28d","src/unicode/sentence.rs":"85bab665e0be53957743211cb4956060b6087716127251a3f962a57e87cd2775","src/unicode/whitespace.rs":"f4961ea2020edb6bb382a56e7ad91ee9b221670842669c5e070f19995840abaa","src/unicode/word.rs":"73eef99becfd0697f55500052df057c45a3aa9393839e67f77dbd227a7ea88f4","src/utf8.rs":"e759713023dc3e5f9f5b2e6c3ba601af591ce5b2ad71aba729e3c29bcf6007e3"},"package":"542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"}
\ No newline at end of file
diff --git a/vendor/bstr/Cargo.lock b/vendor/bstr/Cargo.lock
index 6d3746ae3..7a29b8589 100644
--- a/vendor/bstr/Cargo.lock
+++ b/vendor/bstr/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "bstr"
-version = "1.6.2"
+version = "1.8.0"
 dependencies = [
  "memchr",
  "quickcheck",
@@ -39,9 +39,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "memchr"
-version = "2.6.1"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f478948fd84d9f8e86967bf432640e46adfb5a4bd4f14ef7e864ab38220534ae"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
 [[package]]
 name = "proc-macro2"
@@ -90,9 +90,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.7"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
+checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
 
 [[package]]
 name = "regex-lite"
diff --git a/vendor/bstr/Cargo.toml b/vendor/bstr/Cargo.toml
index 2db4367c1..a2d70f4b8 100644
--- a/vendor/bstr/Cargo.toml
+++ b/vendor/bstr/Cargo.toml
@@ -11,9 +11,9 @@
 
 [package]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.65"
 name = "bstr"
-version = "1.6.2"
+version = "1.8.0"
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 exclude = [
     "/.github",
@@ -81,7 +81,7 @@ version = "2.6.1"
 default-features = false
 
 [dependencies.regex-automata]
-version = "0.3.0"
+version = "0.4.1"
 features = ["dfa-search"]
 optional = true
 default-features = false
diff --git a/vendor/bstr/README.md b/vendor/bstr/README.md
index 69cb16379..38515e939 100644
--- a/vendor/bstr/README.md
+++ b/vendor/bstr/README.md
@@ -146,7 +146,7 @@ Unicode support.
 
 ### Minimum Rust version policy
 
-This crate's minimum supported `rustc` version (MSRV) is `1.60.0`.
+This crate's minimum supported `rustc` version (MSRV) is `1.65`.
 
 In general, this crate will be conservative with respect to the minimum
 supported version of Rust. MSRV may be bumped in minor version releases.
diff --git a/vendor/bstr/src/impls.rs b/vendor/bstr/src/impls.rs
index 861ca5376..02ec0f21c 100644
--- a/vendor/bstr/src/impls.rs
+++ b/vendor/bstr/src/impls.rs
@@ -63,6 +63,7 @@ macro_rules! impl_partial_ord {
 mod bstring {
     use core::{
         cmp::Ordering, convert::TryFrom, fmt, iter::FromIterator, ops,
+        str::FromStr,
     };
 
     use alloc::{
@@ -90,6 +91,15 @@ mod bstring {
         }
     }
 
+    impl FromStr for BString {
+        type Err = crate::Utf8Error;
+
+        #[inline]
+        fn from_str(s: &str) -> Result<BString, crate::Utf8Error> {
+            Ok(BString::from(s))
+        }
+    }
+
     impl ops::Deref for BString {
         type Target = Vec<u8>;
 
@@ -1074,6 +1084,12 @@ mod display {
     }
 
     #[test]
+    fn from_str() {
+        let s: BString = "abc".parse().unwrap();
+        assert_eq!(s, BString::new(b"abc".to_vec()));
+    }
+
+    #[test]
     fn width_bigger_than_bstr() {
         assert_eq!(&format!("{:<7}!", &b"abc".as_bstr()), "abc    !");
         assert_eq!(&format!("{:>7}!", &b"abc".as_bstr()), "    abc!");