From c688732f9fca433859e2b8281d096144153b9527 Mon Sep 17 00:00:00 2001
From: Aumetra Weisman <aumetra@cryptolab.net>
Date: Wed, 20 Mar 2024 10:54:42 +0100
Subject: [PATCH] Remove `AsRef<[u8]>` bounds

---
 packages/std/src/memory.rs | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/packages/std/src/memory.rs b/packages/std/src/memory.rs
index e433d4b696..6ce55f323e 100644
--- a/packages/std/src/memory.rs
+++ b/packages/std/src/memory.rs
@@ -83,17 +83,35 @@ pub unsafe fn consume_region(ptr: *mut Region) -> Vec<u8> {
 /// And since `size` is one of the parameters, it is important to pass in the exact same capacity.
 ///
 /// See: <https://doc.rust-lang.org/stable/alloc/alloc/trait.GlobalAlloc.html#safety-2>
-pub unsafe trait RegionSource: AsRef<[u8]> {
+pub unsafe trait RegionSource {
+    fn ptr(&self) -> *const u8;
+    fn len(&self) -> usize;
     fn capacity(&self) -> usize;
 }
 
 unsafe impl RegionSource for &[u8] {
+    fn ptr(&self) -> *const u8 {
+        self.as_ptr()
+    }
+
+    fn len(&self) -> usize {
+        (*self).len()
+    }
+
     fn capacity(&self) -> usize {
         self.len()
     }
 }
 
 unsafe impl RegionSource for Vec<u8> {
+    fn ptr(&self) -> *const u8 {
+        self.as_ptr()
+    }
+
+    fn len(&self) -> usize {
+        self.len()
+    }
+
     fn capacity(&self) -> usize {
         self.capacity()
     }
@@ -103,6 +121,14 @@ unsafe impl<T: ?Sized> RegionSource for &T
 where
     T: RegionSource,
 {
+    fn ptr(&self) -> *const u8 {
+        (**self).ptr()
+    }
+
+    fn len(&self) -> usize {
+        (**self).len()
+    }
+
     fn capacity(&self) -> usize {
         (**self).capacity()
     }
@@ -116,12 +142,12 @@ pub fn build_region<S>(data: S) -> Box<Region>
 where
     S: RegionSource,
 {
-    let data_slice = data.as_ref();
-    let data_ptr = data_slice.as_ptr() as usize;
+    // Well, this technically violates pointer provenance rules.
+    // But there isn't a stable API for it, so that's the best we can do, I guess.
     build_region_from_components(
-        u32::try_from(data_ptr).expect("pointer doesn't fit in u32"),
+        u32::try_from(data.ptr() as usize).expect("pointer doesn't fit in u32"),
         u32::try_from(data.capacity()).expect("capacity doesn't fit in u32"),
-        u32::try_from(data_slice.len()).expect("length doesn't fit in u32"),
+        u32::try_from(data.len()).expect("length doesn't fit in u32"),
     )
 }