port to meson cargoHEADmasterfeature/port-to-meson-cargo

Use the new unstable meson cargo support. This simplifies the
meson.build script and allows to use crates such as clap that require
picking up features from Cargo.toml.

This also allows us to not embed thiserror in subprojects, and instead
use a wrap file with a custom meson.build and some patches to make it
compile without running its build.rs script.

1 files changed, 0 insertions, 83 deletions

diff --git a/subprojects/thiserror/impl/src/generics.rs b/subprojects/thiserror/impl/src/generics.rs
deleted file mode 100644
index 26fe0a9..0000000
--- a/subprojects/thiserror/impl/src/generics.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use proc_macro2::TokenStream;
-use quote::ToTokens;
-use std::collections::btree_map::Entry;
-use std::collections::{BTreeMap as Map, BTreeSet as Set};
-use syn::punctuated::Punctuated;
-use syn::{parse_quote, GenericArgument, Generics, Ident, PathArguments, Token, Type, WhereClause};
-
-pub struct ParamsInScope<'a> {
-    names: Set<&'a Ident>,
-}
-
-impl<'a> ParamsInScope<'a> {
-    pub fn new(generics: &'a Generics) -> Self {
-        ParamsInScope {
-            names: generics.type_params().map(|param| &param.ident).collect(),
-        }
-    }
-
-    pub fn intersects(&self, ty: &Type) -> bool {
-        let mut found = false;
-        crawl(self, ty, &mut found);
-        found
-    }
-}
-
-fn crawl(in_scope: &ParamsInScope, ty: &Type, found: &mut bool) {
-    if let Type::Path(ty) = ty {
-        if let Some(qself) = &ty.qself {
-            crawl(in_scope, &qself.ty, found);
-        } else {
-            let front = ty.path.segments.first().unwrap();
-            if front.arguments.is_none() && in_scope.names.contains(&front.ident) {
-                *found = true;
-            }
-        }
-        for segment in &ty.path.segments {
-            if let PathArguments::AngleBracketed(arguments) = &segment.arguments {
-                for arg in &arguments.args {
-                    if let GenericArgument::Type(ty) = arg {
-                        crawl(in_scope, ty, found);
-                    }
-                }
-            }
-        }
-    }
-}
-
-pub struct InferredBounds {
-    bounds: Map<String, (Set<String>, Punctuated<TokenStream, Token![+]>)>,
-    order: Vec<TokenStream>,
-}
-
-impl InferredBounds {
-    pub fn new() -> Self {
-        InferredBounds {
-            bounds: Map::new(),
-            order: Vec::new(),
-        }
-    }
-
-    pub fn insert(&mut self, ty: impl ToTokens, bound: impl ToTokens) {
-        let ty = ty.to_token_stream();
-        let bound = bound.to_token_stream();
-        let entry = self.bounds.entry(ty.to_string());
-        if let Entry::Vacant(_) = entry {
-            self.order.push(ty);
-        }
-        let (set, tokens) = entry.or_default();
-        if set.insert(bound.to_string()) {
-            tokens.push(bound);
-        }
-    }
-
-    pub fn augment_where_clause(&self, generics: &Generics) -> WhereClause {
-        let mut generics = generics.clone();
-        let where_clause = generics.make_where_clause();
-        for ty in &self.order {
-            let (_set, bounds) = &self.bounds[&ty.to_string()];
-            where_clause.predicates.push(parse_quote!(#ty: #bounds));
-        }
-        generics.where_clause.unwrap()
-    }
-}