Add explicit keyword for generated constructor (#386)

* Add explicit keyword for generated constructor * Update feature_tests headers after cargo make gen.
rust-diplomat · Dec 11, 2023 · 5056b7b · 5056b7b
1 parent 6085136
commit 5056b7b
Show file tree

Hide file tree

Showing 32 changed files with 32 additions and 32 deletions.
diff --git a/example/cpp/include/ICU4XDataProvider.hpp b/example/cpp/include/ICU4XDataProvider.hpp
diff --git a/example/cpp/include/ICU4XFixedDecimal.hpp b/example/cpp/include/ICU4XFixedDecimal.hpp
diff --git a/example/cpp/include/ICU4XFixedDecimalFormatter.hpp b/example/cpp/include/ICU4XFixedDecimalFormatter.hpp
diff --git a/example/cpp/include/ICU4XLocale.hpp b/example/cpp/include/ICU4XLocale.hpp
diff --git a/feature_tests/cpp/include/AttrOpaque1.hpp b/feature_tests/cpp/include/AttrOpaque1.hpp
diff --git a/feature_tests/cpp/include/AttrOpaque2.hpp b/feature_tests/cpp/include/AttrOpaque2.hpp
diff --git a/feature_tests/cpp/include/Bar.hpp b/feature_tests/cpp/include/Bar.hpp
diff --git a/feature_tests/cpp/include/Float64Vec.hpp b/feature_tests/cpp/include/Float64Vec.hpp
diff --git a/feature_tests/cpp/include/Foo.hpp b/feature_tests/cpp/include/Foo.hpp
diff --git a/feature_tests/cpp/include/MyString.hpp b/feature_tests/cpp/include/MyString.hpp
diff --git a/feature_tests/cpp/include/One.hpp b/feature_tests/cpp/include/One.hpp
diff --git a/feature_tests/cpp/include/Opaque.hpp b/feature_tests/cpp/include/Opaque.hpp
diff --git a/feature_tests/cpp/include/OptionOpaque.hpp b/feature_tests/cpp/include/OptionOpaque.hpp
diff --git a/feature_tests/cpp/include/OptionOpaqueChar.hpp b/feature_tests/cpp/include/OptionOpaqueChar.hpp
diff --git a/feature_tests/cpp/include/RefList.hpp b/feature_tests/cpp/include/RefList.hpp
diff --git a/feature_tests/cpp/include/RefListParameter.hpp b/feature_tests/cpp/include/RefListParameter.hpp
diff --git a/feature_tests/cpp/include/ResultOpaque.hpp b/feature_tests/cpp/include/ResultOpaque.hpp
diff --git a/feature_tests/cpp/include/Two.hpp b/feature_tests/cpp/include/Two.hpp
diff --git a/tool/src/cpp/snapshots/diplomat_tool__cpp__conversions__tests__enum_conversion@Foo.hpp.snap b/tool/src/cpp/snapshots/diplomat_tool__cpp__conversions__tests__enum_conversion@Foo.hpp.snap
@@ -30,7 +30,7 @@ class Foo {
   MyStruct get_struct() const;
   inline const capi::Foo* AsFFI() const { return this->inner.get(); }
   inline capi::Foo* AsFFIMut() { return this->inner.get(); }
-  inline Foo(capi::Foo* i) : inner(i) {}
+  inline explicit Foo(capi::Foo* i) : inner(i) {}
   Foo() = default;
   Foo(Foo&&) noexcept = default;
   Foo& operator=(Foo&& other) noexcept = default;

diff --git a/...cpp/snapshots/diplomat_tool__cpp__conversions__tests__option_conversion@MyStruct.hpp.snap b/...cpp/snapshots/diplomat_tool__cpp__conversions__tests__option_conversion@MyStruct.hpp.snap
@@ -30,7 +30,7 @@ class MyStruct {
   std::optional<MyStruct> create() const;
   inline const capi::MyStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyStruct(capi::MyStruct* i) : inner(i) {}
+  inline explicit MyStruct(capi::MyStruct* i) : inner(i) {}
   MyStruct() = default;
   MyStruct(MyStruct&&) noexcept = default;
   MyStruct& operator=(MyStruct&& other) noexcept = default;

diff --git a/...t_tool__cpp__conversions__tests__option_conversion_using_library_config@MyStruct.hpp.snap b/...t_tool__cpp__conversions__tests__option_conversion_using_library_config@MyStruct.hpp.snap
@@ -33,7 +33,7 @@ class MyStruct {
   mozilla::Maybe<MyStruct> create() const;
   inline const capi::MyStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyStruct(capi::MyStruct* i) : inner(i) {}
+  inline explicit MyStruct(capi::MyStruct* i) : inner(i) {}
   MyStruct() = default;
   MyStruct(MyStruct&&) noexcept = default;
   MyStruct& operator=(MyStruct&& other) noexcept = default;

diff --git a/...c/cpp/snapshots/diplomat_tool__cpp__structs__tests__method_taking_slice@MyStruct.hpp.snap b/...c/cpp/snapshots/diplomat_tool__cpp__structs__tests__method_taking_slice@MyStruct.hpp.snap
@@ -31,7 +31,7 @@ class MyStruct {
   void set_slice(const diplomat::span<const double> new_slice);
   inline const capi::MyStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyStruct(capi::MyStruct* i) : inner(i) {}
+  inline explicit MyStruct(capi::MyStruct* i) : inner(i) {}
   MyStruct() = default;
   MyStruct(MyStruct&&) noexcept = default;
   MyStruct& operator=(MyStruct&& other) noexcept = default;

diff --git a/...mat_tool__cpp__structs__tests__method_taking_slice_using_library_config@MyStruct.hpp.snap b/...mat_tool__cpp__structs__tests__method_taking_slice_using_library_config@MyStruct.hpp.snap
@@ -34,7 +34,7 @@ class MyStruct {
   void set_slice(const mozilla::Span<const double> new_slice);
   inline const capi::MyStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyStruct(capi::MyStruct* i) : inner(i) {}
+  inline explicit MyStruct(capi::MyStruct* i) : inner(i) {}
   MyStruct() = default;
   MyStruct(MyStruct&&) noexcept = default;
   MyStruct& operator=(MyStruct&& other) noexcept = default;

diff --git a/...src/cpp/snapshots/diplomat_tool__cpp__structs__tests__method_taking_str@MyStruct.hpp.snap b/...src/cpp/snapshots/diplomat_tool__cpp__structs__tests__method_taking_str@MyStruct.hpp.snap
@@ -31,7 +31,7 @@ class MyStruct {
   void set_str(const std::string_view new_str);
   inline const capi::MyStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyStruct(capi::MyStruct* i) : inner(i) {}
+  inline explicit MyStruct(capi::MyStruct* i) : inner(i) {}
   MyStruct() = default;
   MyStruct(MyStruct&&) noexcept = default;
   MyStruct& operator=(MyStruct&& other) noexcept = default;

diff --git a/.../cpp/snapshots/diplomat_tool__cpp__structs__tests__method_writeable_out@MyStruct.hpp.snap b/.../cpp/snapshots/diplomat_tool__cpp__structs__tests__method_writeable_out@MyStruct.hpp.snap
@@ -35,7 +35,7 @@ class MyStruct {
   uint8_t write_no_rearrange(capi::DiplomatWriteable& out) const;
   inline const capi::MyStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyStruct(capi::MyStruct* i) : inner(i) {}
+  inline explicit MyStruct(capi::MyStruct* i) : inner(i) {}
   MyStruct() = default;
   MyStruct(MyStruct&&) noexcept = default;
   MyStruct& operator=(MyStruct&& other) noexcept = default;

diff --git a/.../cpp/snapshots/diplomat_tool__cpp__structs__tests__simple_opaque_struct@MyStruct.hpp.snap b/.../cpp/snapshots/diplomat_tool__cpp__structs__tests__simple_opaque_struct@MyStruct.hpp.snap
@@ -32,7 +32,7 @@ class MyStruct {
   void set_b(uint8_t b);
   inline const capi::MyStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyStruct(capi::MyStruct* i) : inner(i) {}
+  inline explicit MyStruct(capi::MyStruct* i) : inner(i) {}
   MyStruct() = default;
   MyStruct(MyStruct&&) noexcept = default;
   MyStruct& operator=(MyStruct&& other) noexcept = default;

diff --git a/tool/src/cpp/snapshots/diplomat_tool__cpp__tests__cross_module_struct_methods@Foo.hpp.snap b/tool/src/cpp/snapshots/diplomat_tool__cpp__tests__cross_module_struct_methods@Foo.hpp.snap
@@ -30,7 +30,7 @@ class Foo {
   Bar to_bar() const;
   inline const capi::Foo* AsFFI() const { return this->inner.get(); }
   inline capi::Foo* AsFFIMut() { return this->inner.get(); }
-  inline Foo(capi::Foo* i) : inner(i) {}
+  inline explicit Foo(capi::Foo* i) : inner(i) {}
   Foo() = default;
   Foo(Foo&&) noexcept = default;
   Foo& operator=(Foo&& other) noexcept = default;

diff --git a/.../src/cpp/snapshots/diplomat_tool__cpp__types__tests__option_types@MyOpaqueStruct.hpp.snap b/.../src/cpp/snapshots/diplomat_tool__cpp__types__tests__option_types@MyOpaqueStruct.hpp.snap
@@ -28,7 +28,7 @@ class MyOpaqueStruct {
  public:
   inline const capi::MyOpaqueStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyOpaqueStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyOpaqueStruct(capi::MyOpaqueStruct* i) : inner(i) {}
+  inline explicit MyOpaqueStruct(capi::MyOpaqueStruct* i) : inner(i) {}
   MyOpaqueStruct() = default;
   MyOpaqueStruct(MyOpaqueStruct&&) noexcept = default;
   MyOpaqueStruct& operator=(MyOpaqueStruct&& other) noexcept = default;

diff --git a/...plomat_tool__cpp__types__tests__option_types_using_library_config@MyOpaqueStruct.hpp.snap b/...plomat_tool__cpp__types__tests__option_types_using_library_config@MyOpaqueStruct.hpp.snap
@@ -31,7 +31,7 @@ class MyOpaqueStruct {
  public:
   inline const capi::MyOpaqueStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyOpaqueStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyOpaqueStruct(capi::MyOpaqueStruct* i) : inner(i) {}
+  inline explicit MyOpaqueStruct(capi::MyOpaqueStruct* i) : inner(i) {}
   MyOpaqueStruct() = default;
   MyOpaqueStruct(MyOpaqueStruct&&) noexcept = default;
   MyOpaqueStruct& operator=(MyOpaqueStruct&& other) noexcept = default;

diff --git a/...src/cpp/snapshots/diplomat_tool__cpp__types__tests__pointer_types@MyOpaqueStruct.hpp.snap b/...src/cpp/snapshots/diplomat_tool__cpp__types__tests__pointer_types@MyOpaqueStruct.hpp.snap
@@ -28,7 +28,7 @@ class MyOpaqueStruct {
  public:
   inline const capi::MyOpaqueStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyOpaqueStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyOpaqueStruct(capi::MyOpaqueStruct* i) : inner(i) {}
+  inline explicit MyOpaqueStruct(capi::MyOpaqueStruct* i) : inner(i) {}
   MyOpaqueStruct() = default;
   MyOpaqueStruct(MyOpaqueStruct&&) noexcept = default;
   MyOpaqueStruct& operator=(MyOpaqueStruct&& other) noexcept = default;

diff --git a/.../src/cpp/snapshots/diplomat_tool__cpp__types__tests__result_types@MyOpaqueStruct.hpp.snap b/.../src/cpp/snapshots/diplomat_tool__cpp__types__tests__result_types@MyOpaqueStruct.hpp.snap
@@ -28,7 +28,7 @@ class MyOpaqueStruct {
  public:
   inline const capi::MyOpaqueStruct* AsFFI() const { return this->inner.get(); }
   inline capi::MyOpaqueStruct* AsFFIMut() { return this->inner.get(); }
-  inline MyOpaqueStruct(capi::MyOpaqueStruct* i) : inner(i) {}
+  inline explicit MyOpaqueStruct(capi::MyOpaqueStruct* i) : inner(i) {}
   MyOpaqueStruct() = default;
   MyOpaqueStruct(MyOpaqueStruct&&) noexcept = default;
   MyOpaqueStruct& operator=(MyOpaqueStruct&& other) noexcept = default;

diff --git a/tool/src/cpp/structs.rs b/tool/src/cpp/structs.rs
@@ -90,7 +90,7 @@ pub fn gen_struct<W: fmt::Write>(
 
                 writeln!(
                     &mut public_body,
-                    "inline {}(capi::{}* i) : inner(i) {{}}",
+                    "inline explicit {}(capi::{}* i) : inner(i) {{}}",
                     opaque.name, opaque.name
                 )?;
                 writeln!(