deprecate Bytes::op_set

moonbitlang · Jan 14, 2025 · 6d24878 · 6d24878
1 parent 9cf1483
commit 6d24878
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 91 deletions.
diff --git a/builtin/builtin.mbti b/builtin/builtin.mbti
@@ -693,7 +693,6 @@ impl FixedArray {
 
 impl Bytes {
   blit(Bytes, Int, Bytes, Int, Int) -> Unit
-  blit_from_string(Bytes, Int, String, Int, Int) -> Unit //deprecated
   copy(Bytes) -> Bytes
   length(Bytes) -> Int
   make(Int, Byte) -> Bytes
@@ -703,9 +702,7 @@ impl Bytes {
   op_as_view(Bytes, start~ : Int = .., end? : Int) -> BytesView
   op_equal(Bytes, Bytes) -> Bool
   op_get(Bytes, Int) -> Byte
-  op_set(Bytes, Int, Byte) -> Unit
-  set_utf16_char(Bytes, Int, Char) -> Int //deprecated
-  set_utf8_char(Bytes, Int, Char) -> Int //deprecated
+  op_set(Bytes, Int, Byte) -> Unit //deprecated
   sub_string(Bytes, Int, Int) -> String //deprecated
   to_string(Bytes) -> String //deprecated
   to_unchecked_string(Bytes, offset~ : Int = .., length~ : Int = ..) -> String

diff --git a/builtin/bytes.mbt b/builtin/bytes.mbt
@@ -101,33 +101,6 @@ pub fn to_unchecked_string(
   unsafe_sub_string(self, offset, length)
 }
 
-///|
-/// Copy `length` chars from string `str`, starting at `str_offset`,
-/// into byte sequence `self`, starting at `bytes_offset`.
-/// @alert deprecated "The type Bytes is about to be changed to be immutable. Use `FixedArray[Byte]` or `Buffer` instead."
-/// @coverage.skip
-pub fn blit_from_string(
-  self : Bytes,
-  bytes_offset : Int,
-  str : String,
-  str_offset : Int,
-  length : Int
-) -> Unit {
-  let s1 = bytes_offset
-  let s2 = str_offset
-  let e1 = bytes_offset + length - 1
-  let e2 = str_offset + length - 1
-  let len1 = self.length()
-  let len2 = str.length()
-  guard length >= 0 && s1 >= 0 && e1 < len1 && s2 >= 0 && e2 < len2
-  let end_str_offset = str_offset + length
-  for i = str_offset, j = bytes_offset; i < end_str_offset; i = i + 1, j = j + 2 {
-    let c = str[i].to_uint()
-    self[j] = (c & 0xff).to_byte()
-    self[j + 1] = (c >> 8).to_byte()
-  }
-}
-
 ///|
 /// Copy `length` chars from string `str`, starting at `str_offset`,
 /// into byte sequence `self`, starting at `bytes_offset`.
@@ -182,40 +155,6 @@ pub fn copy(self : Bytes) -> Bytes {
   Bytes::new(self.length())..blit(0, self, 0, self.length())
 }
 
-///|
-/// Fill UTF8 encoded char `value` into byte sequence `self`, starting at `offset`.
-/// It return the length of bytes has been written.
-/// @alert deprecated "The type Bytes is about to be changed to be immutable. Use `FixedArray[Byte]` or `Buffer` instead."
-/// @coverage.skip
-pub fn set_utf8_char(self : Bytes, offset : Int, value : Char) -> Int {
-  let code = value.to_uint()
-  match code {
-    _..<0x80 => {
-      self[offset] = ((code & 0x7F) | 0x00).to_byte()
-      1
-    }
-    _..<0x0800 => {
-      self[offset] = (((code >> 6) & 0x1F) | 0xC0).to_byte()
-      self[offset + 1] = ((code & 0x3F) | 0x80).to_byte()
-      2
-    }
-    _..<0x010000 => {
-      self[offset] = (((code >> 12) & 0x0F) | 0xE0).to_byte()
-      self[offset + 1] = (((code >> 6) & 0x3F) | 0x80).to_byte()
-      self[offset + 2] = ((code & 0x3F) | 0x80).to_byte()
-      3
-    }
-    _..<0x110000 => {
-      self[offset] = (((code >> 18) & 0x07) | 0xF0).to_byte()
-      self[offset + 1] = (((code >> 12) & 0x3F) | 0x80).to_byte()
-      self[offset + 2] = (((code >> 6) & 0x3F) | 0x80).to_byte()
-      self[offset + 3] = ((code & 0x3F) | 0x80).to_byte()
-      4
-    }
-    _ => abort("Char out of range")
-  }
-}
-
 ///|
 /// Fill UTF8 encoded char `value` into byte sequence `self`, starting at `offset`.
 /// It return the length of bytes has been written.
@@ -252,32 +191,6 @@ pub fn set_utf8_char(
   }
 }
 
-///|
-/// Fill UTF16 encoded char `value` into byte sequence `self`, starting at `offset`.
-/// It return the length of bytes has been written.
-/// @alert unsafe "Panic if the [value] is out of range"
-/// @alert deprecated "The type Bytes is about to be changed to be immutable. Use `FixedArray[Byte]` or `Buffer` instead."
-/// @coverage.skip
-pub fn set_utf16_char(self : Bytes, offset : Int, value : Char) -> Int {
-  let code = value.to_uint()
-  if code < 0x10000 {
-    self[offset] = (code & 0xFF).to_byte()
-    self[offset + 1] = (code >> 8).to_byte()
-    2
-  } else if code < 0x110000 {
-    let hi = code - 0x10000
-    let lo = (hi >> 10) | 0xD800
-    let hi = (hi & 0x3FF) | 0xDC00
-    self[offset] = (lo & 0xFF).to_byte()
-    self[offset + 1] = (lo >> 8).to_byte()
-    self[offset + 2] = (hi & 0xFF).to_byte()
-    self[offset + 3] = (hi >> 8).to_byte()
-    4
-  } else {
-    abort("Char out of range")
-  }
-}
-
 ///|
 /// Fill utf16 encoded char `value` into byte sequence `self`, starting at `offset`.
 /// It return the length of bytes has been written.

diff --git a/builtin/intrinsics.mbt b/builtin/intrinsics.mbt
@@ -236,6 +236,7 @@ pub fn Bytes::op_get(self : Bytes, idx : Int) -> Byte = "%bytes_get"
 pub fn Bytes::unsafe_get(self : Bytes, idx : Int) -> Byte = "%bytes_get"
 
 ///|
+/// @alert deprecated "Bytes is about to be changed to immutable, use `FixedArray[Byte]` instead"
 pub fn Bytes::op_set(self : Bytes, idx : Int, val : Byte) -> Unit = "%bytes_set"
 
 ///|
-Original file line number
+Diff line change
@@ Expand Up @@
     pub fn Bytes::unsafe_get(self : Bytes, idx : Int) -> Byte = "%bytes_get"
     ///|
+    /// @alert deprecated "Bytes is about to be changed to immutable, use `FixedArray[Byte]` instead"
     pub fn Bytes::op_set(self : Bytes, idx : Int, val : Byte) -> Unit = "%bytes_set"
     ///|
@@ Expand Down @@