Deny returning owned slices (rust-diplomat#579)

robertbastian · Jul 19, 2024 · bd491cb · bd491cb
1 parent f922f89
commit bd491cb
Show file tree

Hide file tree

Showing 25 changed files with 70 additions and 141 deletions.
diff --git a/core/src/hir/lowering.rs b/core/src/hir/lowering.rs
@@ -924,8 +924,14 @@ impl<'ast> LoweringContext<'ast> {
                 ));
                 Err(())
             }
-            ast::TypeName::StrReference(lifetime, encoding) => Ok(OutType::Slice(Slice::Str(
-                lifetime.as_ref().map(|l| ltl.lower_lifetime(l)),
+            ast::TypeName::PrimitiveSlice(None, _) | ast::TypeName::StrReference(None, _) => {
+                self.errors.push(LoweringError::Other(
+                    "Owned slices cannot be returned".into(),
+                ));
+                Err(())
+            }
+            ast::TypeName::StrReference(Some(l), encoding) => Ok(OutType::Slice(Slice::Str(
+                Some(ltl.lower_lifetime(l)),
                 *encoding,
             ))),
             ast::TypeName::StrSlice(..) => {
@@ -934,11 +940,12 @@ impl<'ast> LoweringContext<'ast> {
                 ));
                 Err(())
             }
-            ast::TypeName::PrimitiveSlice(lm, prim) => Ok(OutType::Slice(Slice::Primitive(
-                lm.as_ref()
-                    .map(|(lt, m)| Borrow::new(ltl.lower_lifetime(lt), *m)),
-                PrimitiveType::from_ast(*prim),
-            ))),
+            ast::TypeName::PrimitiveSlice(Some((lt, m)), prim) => {
+                Ok(OutType::Slice(Slice::Primitive(
+                    Some(Borrow::new(ltl.lower_lifetime(lt), *m)),
+                    PrimitiveType::from_ast(*prim),
+                )))
+            }
             ast::TypeName::Unit => {
                 self.errors.push(LoweringError::Other("Unit types can only appear as the return value of a method, or as the Ok/Err variants of a returned result".into()));
                 Err(())

diff --git a/feature_tests/c/include/Float64Vec.h b/feature_tests/c/include/Float64Vec.h
diff --git a/feature_tests/c/include/MyString.h b/feature_tests/c/include/MyString.h
diff --git a/feature_tests/c/include/Utf16Wrap.h b/feature_tests/c/include/Utf16Wrap.h
diff --git a/feature_tests/cpp/include/Float64Vec.d.hpp b/feature_tests/cpp/include/Float64Vec.d.hpp
diff --git a/feature_tests/cpp/include/Float64Vec.hpp b/feature_tests/cpp/include/Float64Vec.hpp
diff --git a/feature_tests/cpp/include/MyString.d.hpp b/feature_tests/cpp/include/MyString.d.hpp
diff --git a/feature_tests/cpp/include/MyString.hpp b/feature_tests/cpp/include/MyString.hpp
diff --git a/feature_tests/cpp/include/Utf16Wrap.d.hpp b/feature_tests/cpp/include/Utf16Wrap.d.hpp
diff --git a/feature_tests/cpp/include/Utf16Wrap.hpp b/feature_tests/cpp/include/Utf16Wrap.hpp
diff --git a/feature_tests/dart/lib/src/Float64Vec.g.dart b/feature_tests/dart/lib/src/Float64Vec.g.dart
diff --git a/feature_tests/dart/lib/src/MyString.g.dart b/feature_tests/dart/lib/src/MyString.g.dart
diff --git a/feature_tests/dart/lib/src/Utf16Wrap.g.dart b/feature_tests/dart/lib/src/Utf16Wrap.g.dart
diff --git a/feature_tests/js/api/Float64Vec.d.ts b/feature_tests/js/api/Float64Vec.d.ts
diff --git a/feature_tests/js/api/Float64Vec.mjs b/feature_tests/js/api/Float64Vec.mjs
diff --git a/feature_tests/js/api/MyString.d.ts b/feature_tests/js/api/MyString.d.ts
diff --git a/feature_tests/js/api/MyString.mjs b/feature_tests/js/api/MyString.mjs
diff --git a/feature_tests/js/api/Utf16Wrap.d.ts b/feature_tests/js/api/Utf16Wrap.d.ts
diff --git a/feature_tests/js/api/Utf16Wrap.mjs b/feature_tests/js/api/Utf16Wrap.mjs
diff --git a/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/Float64Vec.kt b/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/Float64Vec.kt
diff --git a/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/MyString.kt b/feature_tests/kotlin/somelib/src/main/kotlin/dev/diplomattest/somelib/MyString.kt