Merging upstream version 1.72.1+dfsg1.

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

8 files changed, 0 insertions, 543 deletions

diff --git a/vendor/proc-macro-error-attr/.cargo-checksum.json b/vendor/proc-macro-error-attr/.cargo-checksum.json
deleted file mode 100644
index c30b5418a..000000000
--- a/vendor/proc-macro-error-attr/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"fbd3ce928441a0b43859bbbe36549f05e7a1ebfee62e5982710671a8f41de527","LICENSE-APACHE":"6fd0f3522047150ca7c1939f02bc4a15662a4741a89bc03ae784eefa18caa299","LICENSE-MIT":"544b3aed1fd723d0cadea567affdcfe0431e43e18d997a718f9d67256b814fde","build.rs":"37b0aca3c4a14dfc050c2df38ae633311d7a1532cdbb8eb57182802c4a1983eb","src/lib.rs":"9e3d13c266376b688642572bb4091e094ff5277fce4bee72bcc3c5f982dd831c","src/parse.rs":"2d8f220f91235be8ed0ddcab55ec3699b9d3b28d538ed24197797cc20194c473","src/settings.rs":"be9382479d7a857b55e5a0b1014f72150c9ee7f2bbb5a5bdeabc0f8de2d95c26"},"package":"a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"}
\ No newline at end of file
diff --git a/vendor/proc-macro-error-attr/Cargo.toml b/vendor/proc-macro-error-attr/Cargo.toml
deleted file mode 100644
index a2c766de9..000000000
--- a/vendor/proc-macro-error-attr/Cargo.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "proc-macro-error-attr"
-version = "1.0.4"
-authors = ["CreepySkeleton <creepy-skeleton@yandex.ru>"]
-build = "build.rs"
-description = "Attribute macro for proc-macro-error crate"
-license = "MIT OR Apache-2.0"
-repository = "https://gitlab.com/CreepySkeleton/proc-macro-error"
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-
-[lib]
-proc-macro = true
-[dependencies.proc-macro2]
-version = "1"
-
-[dependencies.quote]
-version = "1"
-[build-dependencies.version_check]
-version = "0.9"
diff --git a/vendor/proc-macro-error-attr/LICENSE-APACHE b/vendor/proc-macro-error-attr/LICENSE-APACHE
deleted file mode 100644
index 658240a84..000000000
--- a/vendor/proc-macro-error-attr/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright 2019-2020 CreepySkeleton <creepy-skeleton@yandex.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/vendor/proc-macro-error-attr/LICENSE-MIT b/vendor/proc-macro-error-attr/LICENSE-MIT
deleted file mode 100644
index fc73e591d..000000000
--- a/vendor/proc-macro-error-attr/LICENSE-MIT
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019-2020 CreepySkeleton
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/proc-macro-error-attr/build.rs b/vendor/proc-macro-error-attr/build.rs
deleted file mode 100644
index f2ac6a70e..000000000
--- a/vendor/proc-macro-error-attr/build.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-fn main() {
-    if version_check::is_max_version("1.36.0").unwrap_or(false) {
-        println!("cargo:rustc-cfg=always_assert_unwind");
-    }
-}
diff --git a/vendor/proc-macro-error-attr/src/lib.rs b/vendor/proc-macro-error-attr/src/lib.rs
deleted file mode 100644
index ac0ac21a2..000000000
--- a/vendor/proc-macro-error-attr/src/lib.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-//! This is `#[proc_macro_error]` attribute to be used with
-//! [`proc-macro-error`](https://docs.rs/proc-macro-error/). There you go.
-
-extern crate proc_macro;
-
-use crate::parse::parse_input;
-use crate::parse::Attribute;
-use proc_macro::TokenStream;
-use proc_macro2::{Literal, Span, TokenStream as TokenStream2, TokenTree};
-use quote::{quote, quote_spanned};
-
-use crate::settings::{Setting::*, *};
-
-mod parse;
-mod settings;
-
-type Result<T> = std::result::Result<T, Error>;
-
-struct Error {
-    span: Span,
-    message: String,
-}
-
-impl Error {
-    fn new(span: Span, message: String) -> Self {
-        Error { span, message }
-    }
-
-    fn into_compile_error(self) -> TokenStream2 {
-        let mut message = Literal::string(&self.message);
-        message.set_span(self.span);
-        quote_spanned!(self.span=> compile_error!{#message})
-    }
-}
-
-#[proc_macro_attribute]
-pub fn proc_macro_error(attr: TokenStream, input: TokenStream) -> TokenStream {
-    match impl_proc_macro_error(attr.into(), input.clone().into()) {
-        Ok(ts) => ts,
-        Err(e) => {
-            let error = e.into_compile_error();
-            let input = TokenStream2::from(input);
-
-            quote!(#input #error).into()
-        }
-    }
-}
-
-fn impl_proc_macro_error(attr: TokenStream2, input: TokenStream2) -> Result<TokenStream> {
-    let (attrs, signature, body) = parse_input(input)?;
-    let mut settings = parse_settings(attr)?;
-
-    let is_proc_macro = is_proc_macro(&attrs);
-    if is_proc_macro {
-        settings.set(AssertUnwindSafe);
-    }
-
-    if detect_proc_macro_hack(&attrs) {
-        settings.set(ProcMacroHack);
-    }
-
-    if settings.is_set(ProcMacroHack) {
-        settings.set(AllowNotMacro);
-    }
-
-    if !(settings.is_set(AllowNotMacro) || is_proc_macro) {
-        return Err(Error::new(
-            Span::call_site(),
-            "#[proc_macro_error] attribute can be used only with procedural macros\n\n  \
-            = hint: if you are really sure that #[proc_macro_error] should be applied \
-            to this exact function, use #[proc_macro_error(allow_not_macro)]\n"
-                .into(),
-        ));
-    }
-
-    let body = gen_body(body, settings);
-
-    let res = quote! {
-        #(#attrs)*
-        #(#signature)*
-        { #body }
-    };
-    Ok(res.into())
-}
-
-#[cfg(not(always_assert_unwind))]
-fn gen_body(block: TokenTree, settings: Settings) -> proc_macro2::TokenStream {
-    let is_proc_macro_hack = settings.is_set(ProcMacroHack);
-    let closure = if settings.is_set(AssertUnwindSafe) {
-        quote!(::std::panic::AssertUnwindSafe(|| #block ))
-    } else {
-        quote!(|| #block)
-    };
-
-    quote!( ::proc_macro_error::entry_point(#closure, #is_proc_macro_hack) )
-}
-
-// FIXME:
-// proc_macro::TokenStream does not implement UnwindSafe until 1.37.0.
-// Considering this is the closure's return type the unwind safety check would fail
-// for virtually every closure possible, the check is meaningless.
-#[cfg(always_assert_unwind)]
-fn gen_body(block: TokenTree, settings: Settings) -> proc_macro2::TokenStream {
-    let is_proc_macro_hack = settings.is_set(ProcMacroHack);
-    let closure = quote!(::std::panic::AssertUnwindSafe(|| #block ));
-    quote!( ::proc_macro_error::entry_point(#closure, #is_proc_macro_hack) )
-}
-
-fn detect_proc_macro_hack(attrs: &[Attribute]) -> bool {
-    attrs
-        .iter()
-        .any(|attr| attr.path_is_ident("proc_macro_hack"))
-}
-
-fn is_proc_macro(attrs: &[Attribute]) -> bool {
-    attrs.iter().any(|attr| {
-        attr.path_is_ident("proc_macro")
-            || attr.path_is_ident("proc_macro_derive")
-            || attr.path_is_ident("proc_macro_attribute")
-    })
-}
diff --git a/vendor/proc-macro-error-attr/src/parse.rs b/vendor/proc-macro-error-attr/src/parse.rs
deleted file mode 100644
index 6f4663f80..000000000
--- a/vendor/proc-macro-error-attr/src/parse.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use crate::{Error, Result};
-use proc_macro2::{Delimiter, Ident, Span, TokenStream, TokenTree};
-use quote::ToTokens;
-use std::iter::Peekable;
-
-pub(crate) fn parse_input(
-    input: TokenStream,
-) -> Result<(Vec<Attribute>, Vec<TokenTree>, TokenTree)> {
-    let mut input = input.into_iter().peekable();
-    let mut attrs = Vec::new();
-
-    while let Some(attr) = parse_next_attr(&mut input)? {
-        attrs.push(attr);
-    }
-
-    let sig = parse_signature(&mut input);
-    let body = input.next().ok_or_else(|| {
-        Error::new(
-            Span::call_site(),
-            "`#[proc_macro_error]` can be applied only to functions".to_string(),
-        )
-    })?;
-
-    Ok((attrs, sig, body))
-}
-
-fn parse_next_attr(
-    input: &mut Peekable<impl Iterator<Item = TokenTree>>,
-) -> Result<Option<Attribute>> {
-    let shebang = match input.peek() {
-        Some(TokenTree::Punct(ref punct)) if punct.as_char() == '#' => input.next().unwrap(),
-        _ => return Ok(None),
-    };
-
-    let group = match input.peek() {
-        Some(TokenTree::Group(ref group)) if group.delimiter() == Delimiter::Bracket => {
-            let res = group.clone();
-            input.next();
-            res
-        }
-        other => {
-            let span = other.map_or(Span::call_site(), |tt| tt.span());
-            return Err(Error::new(span, "expected `[`".to_string()));
-        }
-    };
-
-    let path = match group.stream().into_iter().next() {
-        Some(TokenTree::Ident(ident)) => Some(ident),
-        _ => None,
-    };
-
-    Ok(Some(Attribute {
-        shebang,
-        group: TokenTree::Group(group),
-        path,
-    }))
-}
-
-fn parse_signature(input: &mut Peekable<impl Iterator<Item = TokenTree>>) -> Vec<TokenTree> {
-    let mut sig = Vec::new();
-    loop {
-        match input.peek() {
-            Some(TokenTree::Group(ref group)) if group.delimiter() == Delimiter::Brace => {
-                return sig;
-            }
-            None => return sig,
-            _ => sig.push(input.next().unwrap()),
-        }
-    }
-}
-
-pub(crate) struct Attribute {
-    pub(crate) shebang: TokenTree,
-    pub(crate) group: TokenTree,
-    pub(crate) path: Option<Ident>,
-}
-
-impl Attribute {
-    pub(crate) fn path_is_ident(&self, ident: &str) -> bool {
-        self.path.as_ref().map_or(false, |p| *p == ident)
-    }
-}
-
-impl ToTokens for Attribute {
-    fn to_tokens(&self, ts: &mut TokenStream) {
-        self.shebang.to_tokens(ts);
-        self.group.to_tokens(ts);
-    }
-}
diff --git a/vendor/proc-macro-error-attr/src/settings.rs b/vendor/proc-macro-error-attr/src/settings.rs
deleted file mode 100644
index 0b7ec766f..000000000
--- a/vendor/proc-macro-error-attr/src/settings.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use crate::{Error, Result};
-use proc_macro2::{Ident, Span, TokenStream, TokenTree};
-
-macro_rules! decl_settings {
-    ($($val:expr => $variant:ident),+ $(,)*) => {
-        #[derive(PartialEq)]
-        pub(crate) enum Setting {
-            $($variant),*
-        }
-
-        fn ident_to_setting(ident: Ident) -> Result<Setting> {
-            match &*ident.to_string() {
-                $($val => Ok(Setting::$variant),)*
-                _ => {
-                    let possible_vals = [$($val),*]
-                        .iter()
-                        .map(|v| format!("`{}`", v))
-                        .collect::<Vec<_>>()
-                        .join(", ");
-
-                    Err(Error::new(
-                        ident.span(),
-                        format!("unknown setting `{}`, expected one of {}", ident, possible_vals)))
-                }
-            }
-        }
-    };
-}
-
-decl_settings! {
-    "assert_unwind_safe" => AssertUnwindSafe,
-    "allow_not_macro"    => AllowNotMacro,
-    "proc_macro_hack"    => ProcMacroHack,
-}
-
-pub(crate) fn parse_settings(input: TokenStream) -> Result<Settings> {
-    let mut input = input.into_iter();
-    let mut res = Settings(Vec::new());
-    loop {
-        match input.next() {
-            Some(TokenTree::Ident(ident)) => {
-                res.0.push(ident_to_setting(ident)?);
-            }
-            None => return Ok(res),
-            other => {
-                let span = other.map_or(Span::call_site(), |tt| tt.span());
-                return Err(Error::new(span, "expected identifier".to_string()));
-            }
-        }
-
-        match input.next() {
-            Some(TokenTree::Punct(ref punct)) if punct.as_char() == ',' => {}
-            None => return Ok(res),
-            other => {
-                let span = other.map_or(Span::call_site(), |tt| tt.span());
-                return Err(Error::new(span, "expected `,`".to_string()));
-            }
-        }
-    }
-}
-
-pub(crate) struct Settings(Vec<Setting>);
-
-impl Settings {
-    pub(crate) fn is_set(&self, setting: Setting) -> bool {
-        self.0.iter().any(|s| *s == setting)
-    }
-
-    pub(crate) fn set(&mut self, setting: Setting) {
-        self.0.push(setting)
-    }
-}