Takes are always fresh

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -4732,7 +4732,9 @@ std::string Converter::ConvertPlaceholder(clang::Expr *expr, clang::Expr *arg,
       }
       return ConvertFreshRValue(arg);
     }
-    return std::format("std::mem::take(&mut {})", ConvertLValue(arg));
+    auto lvalue = ConvertLValue(arg);
+    SetFresh();
+    return std::format("std::mem::take(&mut {})", std::move(lvalue));
   }
 
   if (ph_ctx.access == TranslationRule::Access::kMove) {

tests/multi-file/defaulted_move_cross_tu/out/refcount/defaulted_move_cross_tu.rs

@@ -26,9 +26,9 @@ impl S {
     }
     pub fn S_pmutS(_a0: Ptr<S>) -> Self {
         let __this: Value<S> = Rc::new(RefCell::new(Self {
-            v: Rc::new(RefCell::new(
-                (std::mem::take(&mut (*(*_a0.upgrade().deref()).v.borrow_mut()))).clone(),
-            )),
+            v: Rc::new(RefCell::new(std::mem::take(
+                &mut (*(*_a0.upgrade().deref()).v.borrow_mut()),
+            ))),
             n: Rc::new(RefCell::new(Box::new(std::array::from_fn::<_, 2, _>(
                 |__i: usize| (*(*_a0.upgrade().deref()).n.borrow())[(__i) as usize],
             )))),

tests/unit/out/refcount/copy_move_defaulted.rs

@@ -263,12 +263,12 @@ impl Buffer {
     }
     pub fn Buffer_pmutBuffer(_a0: Ptr<Buffer>) -> Self {
         let __this: Value<Buffer> = Rc::new(RefCell::new(Self {
-            data: Rc::new(RefCell::new(
-                (std::mem::take(&mut (*(*_a0.upgrade().deref()).data.borrow_mut()))).clone(),
-            )),
-            rows: Rc::new(RefCell::new(
-                (std::mem::take(&mut (*(*_a0.upgrade().deref()).rows.borrow_mut()))).clone(),
-            )),
+            data: Rc::new(RefCell::new(std::mem::take(
+                &mut (*(*_a0.upgrade().deref()).data.borrow_mut()),
+            ))),
+            rows: Rc::new(RefCell::new(std::mem::take(
+                &mut (*(*_a0.upgrade().deref()).rows.borrow_mut()),
+            ))),
             n: Rc::new(RefCell::new((*(*_a0.upgrade().deref()).n.borrow()))),
             arr: Rc::new(RefCell::new(Box::new(std::array::from_fn::<_, 2, _>(
                 |__i: usize| (*(*_a0.upgrade().deref()).arr.borrow())[(__i) as usize],
@@ -321,9 +321,9 @@ pub struct Owner {
 impl Owner {
     pub fn Owner_pmutOwner(_a0: Ptr<Owner>) -> Self {
         let __this: Value<Owner> = Rc::new(RefCell::new(Self {
-            data: Rc::new(RefCell::new(
-                (std::mem::take(&mut (*(*_a0.upgrade().deref()).data.borrow_mut()))).clone(),
-            )),
+            data: Rc::new(RefCell::new(std::mem::take(
+                &mut (*(*_a0.upgrade().deref()).data.borrow_mut()),
+            ))),
             n: Rc::new(RefCell::new((*(*_a0.upgrade().deref()).n.borrow()))),
             arr: Rc::new(RefCell::new(Box::new(std::array::from_fn::<_, 2, _>(
                 |__i: usize| (*(*_a0.upgrade().deref()).arr.borrow())[(__i) as usize],