Address reviews

Author: joaotgouveia

cpp2rust/converter/mapper.cpp

@@ -790,9 +790,8 @@ void AddRuleForUserDefinedType(clang::NamedDecl *decl) {
 
 std::string ToRustName(std::string name) {
   size_t pos = 0;
-  std::string chars = "<>, ";
-  while ((pos = name.find_first_of(chars, pos)) != std::string::npos) {
-    name.replace(pos, 1, 1, '_');
+  while ((pos = name.find_first_of("<>, ", pos)) != std::string::npos) {
+    name[pos] = '_';
     ++pos;
   }
   return ReplaceAll(name, "::", "_");

tests/unit/class_templates.cpp

@@ -35,8 +35,8 @@ int main() {
 
   MyContainer<float> fmc;
   assert(fmc.empty());
-  fmc.push_back('a');
-  assert(fmc.size() == 1 && fmc.back() == 'a');
+  fmc.push_back(1.0);
+  assert(fmc.size() == 1 && fmc.back() == 1.0);
   fmc.pop_back();
   assert(fmc.empty());
   return 0;

tests/unit/out/refcount/class_templates.rs

@@ -147,12 +147,12 @@ fn main_0() -> i32 {
     let fmc: Value<MyContainer_float_> = Rc::new(RefCell::new(<MyContainer_float_>::default()));
     assert!(({ (*fmc.borrow()).empty() }));
     ({
-        let _item: Value<f32> = Rc::new(RefCell::new((('a' as u8) as f32)));
+        let _item: Value<f32> = Rc::new(RefCell::new((1.0E+0 as f32)));
         (*fmc.borrow()).push_back(_item.as_pointer())
     });
     assert!(
         (({ (*fmc.borrow()).size() }) == 1_usize)
-            && ((({ (*fmc.borrow()).back() }).read()) == ((('a' as u8) as i32) as f32))
+            && (((({ (*fmc.borrow()).back() }).read()) as f64) == 1.0E+0)
     );
     ({ (*fmc.borrow()).pop_back() });
     assert!(({ (*fmc.borrow()).empty() }));

tests/unit/out/unsafe/class_templates.rs

@@ -123,12 +123,11 @@ unsafe fn main_0() -> i32 {
     let mut fmc: MyContainer_float_ = <MyContainer_float_>::default();
     assert!((unsafe { fmc.empty() }));
     (unsafe {
-        let mut _item = (('a' as u8) as f32);
+        let mut _item = (1.0E+0 as f32);
         fmc.push_back(&mut _item)
     });
     assert!(
-        ((unsafe { fmc.size() }) == (1_usize))
-            && ((*(unsafe { fmc.back() })) == ((('a' as u8) as i32) as f32))
+        ((unsafe { fmc.size() }) == (1_usize)) && (((*(unsafe { fmc.back() })) as f64) == (1.0E+0))
     );
     (unsafe { fmc.pop_back() });
     assert!((unsafe { fmc.empty() }));