Use Askama in cpp2 (#338)

rust-diplomat · Jul 11, 2023 · ffeb2bd · ffeb2bd
1 parent 19b6e41
commit ffeb2bd
Show file tree

Hide file tree

Showing 37 changed files with 745 additions and 363 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/src/hir/types.rs b/core/src/hir/types.rs
@@ -68,6 +68,18 @@ impl Type {
     }
 }
 
+impl SelfType {
+    /// Returns whether the self parameter is borrowed immutably.
+    ///
+    /// Curently this can only happen with opaque types.
+    pub fn is_immutably_borrowed(&self) -> bool {
+        match self {
+            SelfType::Opaque(opaque_path) => opaque_path.owner.mutability == Mutability::Immutable,
+            _ => false,
+        }
+    }
+}
+
 impl Slice {
     /// Returns the [`TypeLifetime`] contained in either the `Str` or `Primitive`
     /// variant.

diff --git a/feature_tests/c/include/MyEnum.h b/feature_tests/c/include/MyEnum.h
diff --git a/feature_tests/c/include/MyStruct.h b/feature_tests/c/include/MyStruct.h
diff --git a/feature_tests/c2/include/MyEnum.h b/feature_tests/c2/include/MyEnum.h
diff --git a/feature_tests/c2/include/MyStruct.h b/feature_tests/c2/include/MyStruct.h
diff --git a/feature_tests/cpp/docs/source/structs_ffi.rst b/feature_tests/cpp/docs/source/structs_ffi.rst
diff --git a/feature_tests/cpp/include/MyEnum.h b/feature_tests/cpp/include/MyEnum.h
diff --git a/feature_tests/cpp/include/MyStruct.h b/feature_tests/cpp/include/MyStruct.h
diff --git a/feature_tests/cpp/include/MyStruct.hpp b/feature_tests/cpp/include/MyStruct.hpp
diff --git a/feature_tests/cpp2/include/MyEnum.d.hpp b/feature_tests/cpp2/include/MyEnum.d.hpp
diff --git a/feature_tests/cpp2/include/MyEnum.h b/feature_tests/cpp2/include/MyEnum.h
diff --git a/feature_tests/cpp2/include/MyEnum.hpp b/feature_tests/cpp2/include/MyEnum.hpp
diff --git a/feature_tests/cpp2/include/MyStruct.d.hpp b/feature_tests/cpp2/include/MyStruct.d.hpp
diff --git a/feature_tests/cpp2/include/MyStruct.h b/feature_tests/cpp2/include/MyStruct.h
diff --git a/feature_tests/cpp2/include/MyStruct.hpp b/feature_tests/cpp2/include/MyStruct.hpp
diff --git a/feature_tests/cpp2/tests/structs.cpp b/feature_tests/cpp2/tests/structs.cpp
@@ -17,4 +17,7 @@ int main(int argc, char *argv[]) {
     simple_assert_eq("struct values", s.e, 5991);
     simple_assert_eq("struct values", (uint32_t)s.f, (uint32_t)U'餐');
     simple_assert_eq("struct values", (uint32_t)s.g.AsFFI(), (uint32_t)MyEnum(MyEnum::B).AsFFI());
+
+    simple_assert_eq("enum fn", s.g.into_value(), -1);
+    simple_assert_eq("struct fn", s.into_a(), 17);
 }
diff --git a/feature_tests/dotnet/Lib/Generated/MyStruct.cs b/feature_tests/dotnet/Lib/Generated/MyStruct.cs
diff --git a/feature_tests/dotnet/Lib/Generated/RawMyStruct.cs b/feature_tests/dotnet/Lib/Generated/RawMyStruct.cs
diff --git a/feature_tests/js/api/MyEnum.d.ts b/feature_tests/js/api/MyEnum.d.ts
diff --git a/feature_tests/js/api/MyStruct.d.ts b/feature_tests/js/api/MyStruct.d.ts
diff --git a/feature_tests/js/api/MyStruct.js b/feature_tests/js/api/MyStruct.js
diff --git a/feature_tests/js/docs/source/structs_ffi.rst b/feature_tests/js/docs/source/structs_ffi.rst