From b11aac5e8d359af3e8c2b8b7128ec2b12e0d7556 Mon Sep 17 00:00:00 2001
From: Dustin Spicuzza <dustin@virtualroadside.com>
Date: Sat, 4 Nov 2023 11:56:17 -0400
Subject: [PATCH] Use pybind11's typing that was upstreamed

---
 robotpy_build/include/pybind11_typing.h | 91 +------------------------
 1 file changed, 2 insertions(+), 89 deletions(-)

diff --git a/robotpy_build/include/pybind11_typing.h b/robotpy_build/include/pybind11_typing.h
index b8800aa6..ed7f6f11 100644
--- a/robotpy_build/include/pybind11_typing.h
+++ b/robotpy_build/include/pybind11_typing.h
@@ -1,92 +1,5 @@
-/*
-    pybind11/typing.h: Convenience wrapper classes for basic Python types
-    with more explicit annotations.
-
-    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
-
-    All rights reserved. Use of this source code is governed by a
-    BSD-style license that can be found in the LICENSE file.
-*/
 
 #pragma once
 
-#include <pybind11/pybind11.h>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-/*
-    The following types can be used to direct pybind11-generated docstrings
-    to have have more explicit types (e.g., `List[str]` instead of `list`).
-    Just use these in place of existing types.
-
-    There is no additional enforcement of types at runtime.
-*/
-
-template <typename... Types>
-class Tuple : public tuple {
-    using tuple::tuple;
-};
-
-template <typename K, typename V>
-class Dict : public dict {
-    using dict::dict;
-};
-
-template <typename T>
-class List : public list {
-    using list::list;
-};
-
-template <typename T>
-class Set : public set {
-    using set::set;
-};
-
-template <typename Signature>
-class Callable;
-
-template <typename Return, typename... Args>
-class Callable<Return(Args...)> : public function {
-    using function::function;
-};
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename... Types>
-struct handle_type_name<Tuple<Types...>> {
-    static constexpr auto name
-        = const_name("Tuple[") + concat(make_caster<Types>::name...) + const_name("]");
-};
-
-template <>
-struct handle_type_name<Tuple<>> {
-    // PEP 484 specifies this syntax for an empty tuple
-    static constexpr auto name = const_name("Tuple[()]");
-};
-
-template <typename K, typename V>
-struct handle_type_name<Dict<K, V>> {
-    static constexpr auto name = const_name("Dict[") + make_caster<K>::name + const_name(", ")
-                                 + make_caster<V>::name + const_name("]");
-};
-
-template <typename T>
-struct handle_type_name<List<T>> {
-    static constexpr auto name = const_name("List[") + make_caster<T>::name + const_name("]");
-};
-
-template <typename T>
-struct handle_type_name<Set<T>> {
-    static constexpr auto name = const_name("Set[") + make_caster<T>::name + const_name("]");
-};
-
-template <typename Return, typename... Args>
-struct handle_type_name<Callable<Return(Args...)>> {
-    using retval_type = conditional_t<std::is_same<Return, void>::value, void_type, Return>;
-    static constexpr auto name = const_name("Callable[[") + concat(make_caster<Args>::name...)
-                                 + const_name("], ") + make_caster<retval_type>::name
-                                 + const_name("]");
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
+// our changes were merged to upstream
+#include <pybind11/typing.h>