diff options
| author | David Tolnay <dtolnay@gmail.com> | 2020-12-27 02:51:51 -0800 |
|---|---|---|
| committer | David Tolnay <dtolnay@gmail.com> | 2020-12-27 13:29:06 -0800 |
| commit | e1df7ddba0f819b8fb4ce8f3cb9ddf9ad4d6e037 (patch) | |
| tree | 9d689d4ea29436ef0ae9f73b3bd6478bc2472f27 /src | |
| parent | d5e3ef8d73447545646d846408642c091aed2e25 (diff) | |
| download | cxx-e1df7ddba0f819b8fb4ce8f3cb9ddf9ad4d6e037.tar.gz | |
Eliminate Vec stride symbol in favor of size_of
Diffstat (limited to 'src')
| -rw-r--r-- | src/cxx.cc | 7 | ||||
| -rw-r--r-- | src/symbols/rust_vec.rs | 6 |
2 files changed, 1 insertions, 12 deletions
@@ -450,8 +450,7 @@ static_assert(sizeof(std::string) <= kMaxExpectedWordsInString * sizeof(void *), void cxxbridge1$rust_vec$##RUST_TYPE##$reserve_total( \ rust::Vec<CXX_TYPE> *ptr, std::size_t cap) noexcept; \ void cxxbridge1$rust_vec$##RUST_TYPE##$set_len(rust::Vec<CXX_TYPE> *ptr, \ - std::size_t len) noexcept; \ - std::size_t cxxbridge1$rust_vec$##RUST_TYPE##$stride() noexcept; + std::size_t len) noexcept; #define RUST_VEC_OPS(RUST_TYPE, CXX_TYPE) \ template <> \ @@ -481,10 +480,6 @@ static_assert(sizeof(std::string) <= kMaxExpectedWordsInString * sizeof(void *), template <> \ void Vec<CXX_TYPE>::set_len(std::size_t len) noexcept { \ cxxbridge1$rust_vec$##RUST_TYPE##$set_len(this, len); \ - } \ - template <> \ - std::size_t Vec<CXX_TYPE>::stride() noexcept { \ - return cxxbridge1$rust_vec$##RUST_TYPE##$stride(); \ } #define SHARED_PTR_OPS(RUST_TYPE, CXX_TYPE) \ diff --git a/src/symbols/rust_vec.rs b/src/symbols/rust_vec.rs index 6aa0b763..60b9cfa5 100644 --- a/src/symbols/rust_vec.rs +++ b/src/symbols/rust_vec.rs @@ -53,12 +53,6 @@ macro_rules! rust_vec_shims { (*this).repr.set_len(len); } } - attr! { - #[export_name = concat!("cxxbridge1$rust_vec$", $segment, "$stride")] - unsafe extern "C" fn __stride() -> usize { - mem::size_of::<$ty>() - } - } }; }; } |