commit a83247c5a3d79a414015ebda9108fb3400919849
author David Tolnay <dtolnay@gmail.com> Fri Apr 24 14:36:10 2020 -0700
committer David Tolnay <dtolnay@gmail.com> Sat Apr 25 18:02:11 2020 -0700
tree 8136e3592182b5dc1ba29c9a52172819f1a8fab6
parent 4b91eaaf7fca9df3d9cb49e114e1361bce9ed2f4

Rename std$vector$T$length to match std::vector<T>::size

gen/write.rs

diff --git a/gen/write.rs b/gen/write.rs
index c1aa2f7..3da42b3 100644
--- a/gen/write.rs
+++ b/gen/write.rs
@@ -1131,7 +1131,7 @@
     writeln!(out, "#define CXXBRIDGE02_vector_{}", instance);
     writeln!(
         out,
-        "size_t cxxbridge02$std$vector${}$length(const ::std::vector<{}> &s) noexcept {{",
+        "size_t cxxbridge02$std$vector${}$size(const ::std::vector<{}> &s) noexcept {{",
         instance, inner,
     );
     writeln!(out, "  return s.size();");

macro/src/expand.rs

diff --git a/macro/src/expand.rs b/macro/src/expand.rs
index be23fcf..b2278e0 100644
--- a/macro/src/expand.rs
+++ b/macro/src/expand.rs
@@ -650,7 +650,7 @@
     let inner = ty;
     let mangled = ty.to_mangled(&namespace.segments) + "$";
     let prefix = format!("cxxbridge02$std$vector${}", mangled);
-    let link_length = format!("{}length", prefix);
+    let link_size = format!("{}size", prefix);
     let link_get_unchecked = format!("{}get_unchecked", prefix);
     let link_push_back = format!("{}push_back", prefix);
 
@@ -666,7 +666,7 @@
             fn __vector_size(v: &::cxx::CxxVector<#inner>) -> usize {
                 unsafe {
                     extern "C" {
-                        #[link_name = #link_length]
+                        #[link_name = #link_size]
                         fn __vector_size(_: &::cxx::CxxVector<#inner>) -> usize;
                     }
                     __vector_size(v)
@@ -691,7 +691,7 @@
     let namespace = Namespace { segments: vec![] };
     let mangled = ty.to_mangled(&namespace.segments) + "$";
     let prefix = format!("cxxbridge02$std$vector${}", mangled);
-    let link_length = format!("{}length", prefix);
+    let link_size = format!("{}size", prefix);
     let link_get_unchecked = format!("{}get_unchecked", prefix);
     let link_push_back = format!("{}push_back", prefix);
 
@@ -707,7 +707,7 @@
             fn __vector_size(v: &CxxVector<#inner>) -> usize {
                 unsafe {
                     extern "C" {
-                        #[link_name = #link_length]
+                        #[link_name = #link_size]
                         fn __vector_size(_: &CxxVector<#inner>) -> usize;
                     }
                     __vector_size(v)

src/cxx.cc

diff --git a/src/cxx.cc b/src/cxx.cc
index a0e92ac..15f888d 100644
--- a/src/cxx.cc
+++ b/src/cxx.cc
@@ -201,7 +201,7 @@
 
 #define STD_VECTOR_OPS(RUST_TYPE, CXX_TYPE)                                    \
   extern "C" {                                                                 \
-  size_t cxxbridge02$std$vector$##RUST_TYPE##$length(                          \
+  size_t cxxbridge02$std$vector$##RUST_TYPE##$size(                            \
       const std::vector<CXX_TYPE> &s) noexcept {                               \
     return s.size();                                                           \
   }                                                                            \