Bump inline namespace to match minor version
diff --git a/src/cxx.cc b/src/cxx.cc
index f7b02ec..f55d062 100644
--- a/src/cxx.cc
+++ b/src/cxx.cc
@@ -5,72 +5,72 @@
#include <stdexcept>
extern "C" {
-const char *cxxbridge01$cxx_string$data(const std::string &s) noexcept {
+const char *cxxbridge02$cxx_string$data(const std::string &s) noexcept {
return s.data();
}
-size_t cxxbridge01$cxx_string$length(const std::string &s) noexcept {
+size_t cxxbridge02$cxx_string$length(const std::string &s) noexcept {
return s.length();
}
// rust::String
-void cxxbridge01$string$new(rust::String *self) noexcept;
-void cxxbridge01$string$clone(rust::String *self,
+void cxxbridge02$string$new(rust::String *self) noexcept;
+void cxxbridge02$string$clone(rust::String *self,
const rust::String &other) noexcept;
-bool cxxbridge01$string$from(rust::String *self, const char *ptr,
+bool cxxbridge02$string$from(rust::String *self, const char *ptr,
size_t len) noexcept;
-void cxxbridge01$string$drop(rust::String *self) noexcept;
-const char *cxxbridge01$string$ptr(const rust::String *self) noexcept;
-size_t cxxbridge01$string$len(const rust::String *self) noexcept;
+void cxxbridge02$string$drop(rust::String *self) noexcept;
+const char *cxxbridge02$string$ptr(const rust::String *self) noexcept;
+size_t cxxbridge02$string$len(const rust::String *self) noexcept;
// rust::Str
-bool cxxbridge01$str$valid(const char *ptr, size_t len) noexcept;
+bool cxxbridge02$str$valid(const char *ptr, size_t len) noexcept;
} // extern "C"
namespace rust {
-inline namespace cxxbridge01 {
+inline namespace cxxbridge02 {
-String::String() noexcept { cxxbridge01$string$new(this); }
+String::String() noexcept { cxxbridge02$string$new(this); }
String::String(const String &other) noexcept {
- cxxbridge01$string$clone(this, other);
+ cxxbridge02$string$clone(this, other);
}
String::String(String &&other) noexcept {
this->repr = other.repr;
- cxxbridge01$string$new(&other);
+ cxxbridge02$string$new(&other);
}
-String::~String() noexcept { cxxbridge01$string$drop(this); }
+String::~String() noexcept { cxxbridge02$string$drop(this); }
String::String(const std::string &s) {
auto ptr = s.data();
auto len = s.length();
- if (!cxxbridge01$string$from(this, ptr, len)) {
+ if (!cxxbridge02$string$from(this, ptr, len)) {
throw std::invalid_argument("data for rust::String is not utf-8");
}
}
String::String(const char *s) {
auto len = strlen(s);
- if (!cxxbridge01$string$from(this, s, len)) {
+ if (!cxxbridge02$string$from(this, s, len)) {
throw std::invalid_argument("data for rust::String is not utf-8");
}
}
String &String::operator=(const String &other) noexcept {
if (this != &other) {
- cxxbridge01$string$drop(this);
- cxxbridge01$string$clone(this, other);
+ cxxbridge02$string$drop(this);
+ cxxbridge02$string$clone(this, other);
}
return *this;
}
String &String::operator=(String &&other) noexcept {
if (this != &other) {
- cxxbridge01$string$drop(this);
+ cxxbridge02$string$drop(this);
this->repr = other.repr;
- cxxbridge01$string$new(&other);
+ cxxbridge02$string$new(&other);
}
return *this;
}
@@ -80,12 +80,12 @@
}
const char *String::data() const noexcept {
- return cxxbridge01$string$ptr(this);
+ return cxxbridge02$string$ptr(this);
}
-size_t String::size() const noexcept { return cxxbridge01$string$len(this); }
+size_t String::size() const noexcept { return cxxbridge02$string$len(this); }
-size_t String::length() const noexcept { return cxxbridge01$string$len(this); }
+size_t String::length() const noexcept { return cxxbridge02$string$len(this); }
String::String(unsafe_bitcopy_t, const String &bits) noexcept
: repr(bits.repr) {}
@@ -100,13 +100,13 @@
Str::Str(const Str &) noexcept = default;
Str::Str(const std::string &s) : repr(Repr{s.data(), s.length()}) {
- if (!cxxbridge01$str$valid(this->repr.ptr, this->repr.len)) {
+ if (!cxxbridge02$str$valid(this->repr.ptr, this->repr.len)) {
throw std::invalid_argument("data for rust::Str is not utf-8");
}
}
Str::Str(const char *s) : repr(Repr{s, strlen(s)}) {
- if (!cxxbridge01$str$valid(this->repr.ptr, this->repr.len)) {
+ if (!cxxbridge02$str$valid(this->repr.ptr, this->repr.len)) {
throw std::invalid_argument("data for rust::Str is not utf-8");
}
}
@@ -135,31 +135,31 @@
return os;
}
-} // namespace cxxbridge01
+} // namespace cxxbridge02
} // namespace rust
extern "C" {
-void cxxbridge01$unique_ptr$std$string$null(
+void cxxbridge02$unique_ptr$std$string$null(
std::unique_ptr<std::string> *ptr) noexcept {
new (ptr) std::unique_ptr<std::string>();
}
-void cxxbridge01$unique_ptr$std$string$new(std::unique_ptr<std::string> *ptr,
+void cxxbridge02$unique_ptr$std$string$new(std::unique_ptr<std::string> *ptr,
std::string *value) noexcept {
new (ptr) std::unique_ptr<std::string>(new std::string(std::move(*value)));
}
-void cxxbridge01$unique_ptr$std$string$raw(std::unique_ptr<std::string> *ptr,
+void cxxbridge02$unique_ptr$std$string$raw(std::unique_ptr<std::string> *ptr,
std::string *raw) noexcept {
new (ptr) std::unique_ptr<std::string>(raw);
}
-const std::string *cxxbridge01$unique_ptr$std$string$get(
+const std::string *cxxbridge02$unique_ptr$std$string$get(
const std::unique_ptr<std::string> &ptr) noexcept {
return ptr.get();
}
-std::string *cxxbridge01$unique_ptr$std$string$release(
+std::string *cxxbridge02$unique_ptr$std$string$release(
std::unique_ptr<std::string> &ptr) noexcept {
return ptr.release();
}
-void cxxbridge01$unique_ptr$std$string$drop(
+void cxxbridge02$unique_ptr$std$string$drop(
std::unique_ptr<std::string> *ptr) noexcept {
ptr->~unique_ptr();
}
diff --git a/src/cxx_string.rs b/src/cxx_string.rs
index 40a1731..f2cca5b 100644
--- a/src/cxx_string.rs
+++ b/src/cxx_string.rs
@@ -4,9 +4,9 @@
use std::str::{self, Utf8Error};
extern "C" {
- #[link_name = "cxxbridge01$cxx_string$data"]
+ #[link_name = "cxxbridge02$cxx_string$data"]
fn string_data(_: &CxxString) -> *const u8;
- #[link_name = "cxxbridge01$cxx_string$length"]
+ #[link_name = "cxxbridge02$cxx_string$length"]
fn string_length(_: &CxxString) -> usize;
}
diff --git a/src/rust_str.rs b/src/rust_str.rs
index 3d8a9f0..5b8eaed 100644
--- a/src/rust_str.rs
+++ b/src/rust_str.rs
@@ -23,7 +23,7 @@
}
}
-#[export_name = "cxxbridge01$str$valid"]
+#[export_name = "cxxbridge02$str$valid"]
unsafe extern "C" fn str_valid(ptr: *const u8, len: usize) -> bool {
let slice = slice::from_raw_parts(ptr, len);
str::from_utf8(slice).is_ok()
diff --git a/src/rust_string.rs b/src/rust_string.rs
index 345d969..258576d 100644
--- a/src/rust_string.rs
+++ b/src/rust_string.rs
@@ -30,17 +30,17 @@
}
}
-#[export_name = "cxxbridge01$string$new"]
+#[export_name = "cxxbridge02$string$new"]
unsafe extern "C" fn string_new(this: &mut MaybeUninit<String>) {
ptr::write(this.as_mut_ptr(), String::new());
}
-#[export_name = "cxxbridge01$string$clone"]
+#[export_name = "cxxbridge02$string$clone"]
unsafe extern "C" fn string_clone(this: &mut MaybeUninit<String>, other: &String) {
ptr::write(this.as_mut_ptr(), other.clone());
}
-#[export_name = "cxxbridge01$string$from"]
+#[export_name = "cxxbridge02$string$from"]
unsafe extern "C" fn string_from(
this: &mut MaybeUninit<String>,
ptr: *const u8,
@@ -56,17 +56,17 @@
}
}
-#[export_name = "cxxbridge01$string$drop"]
+#[export_name = "cxxbridge02$string$drop"]
unsafe extern "C" fn string_drop(this: &mut ManuallyDrop<String>) {
ManuallyDrop::drop(this);
}
-#[export_name = "cxxbridge01$string$ptr"]
+#[export_name = "cxxbridge02$string$ptr"]
unsafe extern "C" fn string_ptr(this: &String) -> *const u8 {
this.as_ptr()
}
-#[export_name = "cxxbridge01$string$len"]
+#[export_name = "cxxbridge02$string$len"]
unsafe extern "C" fn string_len(this: &String) -> usize {
this.len()
}
diff --git a/src/unique_ptr.rs b/src/unique_ptr.rs
index 19718bb..94b6e25 100644
--- a/src/unique_ptr.rs
+++ b/src/unique_ptr.rs
@@ -130,17 +130,17 @@
}
extern "C" {
- #[link_name = "cxxbridge01$unique_ptr$std$string$null"]
+ #[link_name = "cxxbridge02$unique_ptr$std$string$null"]
fn unique_ptr_std_string_null(this: *mut *mut c_void);
- #[link_name = "cxxbridge01$unique_ptr$std$string$new"]
+ #[link_name = "cxxbridge02$unique_ptr$std$string$new"]
fn unique_ptr_std_string_new(this: *mut *mut c_void, value: *mut CxxString);
- #[link_name = "cxxbridge01$unique_ptr$std$string$raw"]
+ #[link_name = "cxxbridge02$unique_ptr$std$string$raw"]
fn unique_ptr_std_string_raw(this: *mut *mut c_void, raw: *mut CxxString);
- #[link_name = "cxxbridge01$unique_ptr$std$string$get"]
+ #[link_name = "cxxbridge02$unique_ptr$std$string$get"]
fn unique_ptr_std_string_get(this: *const *mut c_void) -> *const CxxString;
- #[link_name = "cxxbridge01$unique_ptr$std$string$release"]
+ #[link_name = "cxxbridge02$unique_ptr$std$string$release"]
fn unique_ptr_std_string_release(this: *mut *mut c_void) -> *mut CxxString;
- #[link_name = "cxxbridge01$unique_ptr$std$string$drop"]
+ #[link_name = "cxxbridge02$unique_ptr$std$string$drop"]
fn unique_ptr_std_string_drop(this: *mut *mut c_void);
}