From 598cda994b62de8e86c41e40e256dbae173a03ec Mon Sep 17 00:00:00 2001 From: Lucian Popescu Date: Fri, 20 Nov 2026 10:59:54 +0000 Subject: [PATCH 1/4] Receive default argument in the rule --- rules/map/shim.rs | 56 +++++++++++++++++++-------------------- rules/map/tgt_refcount.rs | 4 +-- rules/map/tgt_unsafe.rs | 4 +-- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/rules/map/shim.rs b/rules/map/shim.rs index 3c79350a1d..e2f3551375 100644 --- a/rules/map/shim.rs +++ b/rules/map/shim.rs @@ -191,14 +191,8 @@ impl Map> { .as_pointer() } - fn insert_after(&mut self, prev: Value>>, key: K) -> Ptr - where - V: Default, - { - let entry = ( - Rc::new(RefCell::new(key)), - Rc::new(RefCell::new(V::default())), - ); + fn insert_after(&mut self, prev: Value>>, key: K, value: V) -> Ptr { + let entry = (Rc::new(RefCell::new(key)), Rc::new(RefCell::new(value))); Self::mapped(&self.link_after(prev, entry)) } @@ -231,26 +225,29 @@ impl Map> { // The functions that modify a map take a pointer to it, and borrow it after // their arguments are evaluated, which may access the map. impl Map> { - // operator[] with a key that is copied if inserted. - pub fn subscript(&mut self, key: Ptr) -> Ptr + // operator[] with a key that is copied, and a value made by new_value, if + // inserted. + pub fn subscript(&mut self, key: Ptr, new_value: impl FnOnce() -> V) -> Ptr where K: Clone + ByteRepr, - V: Default, { match self.search(&key) { Ok(node) => Self::mapped(&node), - Err(prev) => self.insert_after(prev, key.read()), + Err(prev) => self.insert_after(prev, key.read(), new_value()), } } - // operator[] with a key that is moved, by new_key, if inserted. - pub fn subscript_move(&mut self, key: Ptr, new_key: impl FnOnce(Ptr) -> K) -> Ptr - where - V: Default, - { + // operator[] with a key that is moved, by new_key, and a value made by + // new_value, if inserted. + pub fn subscript_move( + &mut self, + key: Ptr, + new_key: impl FnOnce(Ptr) -> K, + new_value: impl FnOnce() -> V, + ) -> Ptr { match self.search(&key) { Ok(node) => Self::mapped(&node), - Err(prev) => self.insert_after(prev, new_key(key)), + Err(prev) => self.insert_after(prev, new_key(key), new_value()), } } @@ -486,29 +483,32 @@ impl UnsafeMap { unsafe { &raw mut (*UnsafeMapNode::value(node)).1 } } - // operator[] with a key that is copied if inserted. - pub fn subscript(&mut self, key: &K) -> *mut V + // operator[] with a key that is copied, and a value made by new_value, if + // inserted. + pub fn subscript(&mut self, key: &K, new_value: impl FnOnce() -> V) -> *mut V where K: Clone, - V: Default, { match self.search(key) { Ok(node) => Self::mapped(node), - Err(prev) => Self::mapped(self.link_after(prev, (key.clone(), V::default()))), + Err(prev) => Self::mapped(self.link_after(prev, (key.clone(), new_value()))), } } - /// operator[] with a key that is moved, by new_key, if inserted. + /// operator[] with a key that is moved, by new_key, and a value made by + /// new_value, if inserted. /// /// # Safety /// `key` must point to a live key. - pub unsafe fn subscript_move(&mut self, key: *mut K, new_key: impl FnOnce(*mut K) -> K) -> *mut V - where - V: Default, - { + pub unsafe fn subscript_move( + &mut self, + key: *mut K, + new_key: impl FnOnce(*mut K) -> K, + new_value: impl FnOnce() -> V, + ) -> *mut V { match self.search(unsafe { &*key }) { Ok(node) => Self::mapped(node), - Err(prev) => Self::mapped(self.link_after(prev, (new_key(key), V::default()))), + Err(prev) => Self::mapped(self.link_after(prev, (new_key(key), new_value()))), } } diff --git a/rules/map/tgt_refcount.rs b/rules/map/tgt_refcount.rs index 6632112f9e..e13d53fcf1 100644 --- a/rules/map/tgt_refcount.rs +++ b/rules/map/tgt_refcount.rs @@ -13,7 +13,7 @@ fn f1( a0: &mut Map, Value)>, a1: Ptr, ) -> Ptr { - a0.subscript(a1) + a0.subscript(a1, || T2::default()) } fn f2(a0: Map, Value)>) -> usize { @@ -43,7 +43,7 @@ fn f8( a0: &mut Map, Value)>, a1: Ptr, ) -> Ptr { - a0.subscript_move(a1, |__k| cpp_move!(__k)) + a0.subscript_move(a1, |__k| cpp_move!(__k), || T2::default()) } fn f9(a0: Ptr, Value)>>) -> BidirectionalIterator<(Value, Value)> { diff --git a/rules/map/tgt_unsafe.rs b/rules/map/tgt_unsafe.rs index 6097734584..01c7e2dc59 100644 --- a/rules/map/tgt_unsafe.rs +++ b/rules/map/tgt_unsafe.rs @@ -20,7 +20,7 @@ fn t6() -> T2 { } unsafe fn f1(a0: &mut UnsafeMap, a1: T1) -> &mut T2 { - &mut (*a0.subscript(&a1)) + &mut (*a0.subscript(&a1, || T2::default())) } unsafe fn f2(a0: UnsafeMap) -> usize { @@ -44,7 +44,7 @@ unsafe fn f7(a0: &mut UnsafeMap, a1: T1) -> *const T2 } unsafe fn f8(a0: &mut UnsafeMap, a1: *mut T1) -> &mut T2 { - &mut (*a0.subscript_move(a1, |__k| cpp_move_unsafe!(__k))) + &mut (*a0.subscript_move(a1, |__k| cpp_move_unsafe!(__k), || T2::default())) } unsafe fn f9(a0: UnsafeMap) -> UnsafeBidirectionalIterator<(T1, T2)> { From 166879168091980e3124a58da3f484b138d46e7c Mon Sep 17 00:00:00 2001 From: Lucian Popescu Date: Fri, 20 Nov 2026 11:02:02 +0000 Subject: [PATCH 2/4] Update tests --- .../containers/associative/map/map.access.cpp | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tests/std/containers/associative/map/map.access.cpp diff --git a/tests/std/containers/associative/map/map.access.cpp b/tests/std/containers/associative/map/map.access.cpp new file mode 100644 index 0000000000..f8ef4dff81 --- /dev/null +++ b/tests/std/containers/associative/map/map.access.cpp @@ -0,0 +1,34 @@ +// ADDITIONAL_COMPILE_FLAGS: -std=c++23 +#include +#include +#include + +// N4950 [map.access]/1: operator[](const key_type& x) is equivalent to +// return try_emplace(x).first->second, which value-initializes the mapped +// value of a key that is not in the map. +namespace p1_subscript_lvalue_key_default_string { +void test() { + std::map m; + int key = 1; + assert(m[key].size() == 0); + assert(*m[key].c_str() == '\0'); + assert(m.size() == 1); +} +} // namespace p1_subscript_lvalue_key_default_string + +// N4950 [map.access]/2: operator[](key_type&& x) is equivalent to +// return try_emplace(std::move(x)).first->second. +namespace p2_subscript_rvalue_key_default_string { +void test() { + std::map m; + assert(m[1].size() == 0); + assert(*m[1].c_str() == '\0'); + assert(m.size() == 1); +} +} // namespace p2_subscript_rvalue_key_default_string + +int main() { + p1_subscript_lvalue_key_default_string::test(); + p2_subscript_rvalue_key_default_string::test(); + return 0; +} From 4bf41e8680f4a96d720e6e8c6e05c72eda7ba189 Mon Sep 17 00:00:00 2001 From: Lucian Popescu Date: Fri, 20 Nov 2026 11:07:06 +0000 Subject: [PATCH 3/4] Update tests --- .../map/out/refcount/map.access.rs | 65 ++++++++ .../associative/map/out/unsafe/map.access.rs | 41 +++++ .../allocator.requirements.general.rs | 12 +- .../unsafe/allocator.requirements.general.rs | 8 +- tests/unit/out/refcount/clone_vs_move.rs | 12 +- .../refcount/container_element_receiver.rs | 18 ++- tests/unit/out/refcount/find.rs | 12 +- tests/unit/out/refcount/foreach_map.rs | 2 +- tests/unit/out/refcount/map-reallocation.rs | 8 +- tests/unit/out/refcount/map.rs | 148 +++++++++++++----- tests/unit/out/refcount/map_copy.rs | 20 ++- tests/unit/out/refcount/map_key_copy_ctor.rs | 32 ++-- tests/unit/out/refcount/map_key_identity.rs | 25 ++- tests/unit/out/refcount/map_try_emplace.rs | 9 +- .../out/refcount/map_try_emplace_lvalues.rs | 55 ++++--- tests/unit/out/refcount/operator_traits.rs | 10 +- .../refcount/redundant_copy_in_conversion.rs | 4 +- tests/unit/out/refcount/sort_no_copy.rs | 8 +- tests/unit/out/refcount/swap_map_no_copy.rs | 108 ++++++++++--- .../out/refcount/vector_iter_range_ctor.rs | 12 +- tests/unit/out/unsafe/clone_vs_move.rs | 10 +- .../out/unsafe/container_element_receiver.rs | 4 +- tests/unit/out/unsafe/find.rs | 6 +- tests/unit/out/unsafe/foreach_map.rs | 2 +- tests/unit/out/unsafe/map-reallocation.rs | 8 +- tests/unit/out/unsafe/map.rs | 105 ++++++++----- tests/unit/out/unsafe/map_copy.rs | 12 +- tests/unit/out/unsafe/map_key_copy_ctor.rs | 32 ++-- tests/unit/out/unsafe/map_key_identity.rs | 17 +- tests/unit/out/unsafe/map_try_emplace.rs | 8 +- .../out/unsafe/map_try_emplace_lvalues.rs | 26 +-- tests/unit/out/unsafe/operator_traits.rs | 8 +- .../unsafe/redundant_copy_in_conversion.rs | 2 +- tests/unit/out/unsafe/sort_no_copy.rs | 12 +- tests/unit/out/unsafe/swap_map_no_copy.rs | 69 ++++++-- .../unit/out/unsafe/vector_iter_range_ctor.rs | 6 +- 36 files changed, 672 insertions(+), 264 deletions(-) create mode 100644 tests/std/containers/associative/map/out/refcount/map.access.rs create mode 100644 tests/std/containers/associative/map/out/unsafe/map.access.rs diff --git a/tests/std/containers/associative/map/out/refcount/map.access.rs b/tests/std/containers/associative/map/out/refcount/map.access.rs new file mode 100644 index 0000000000..d8307c430d --- /dev/null +++ b/tests/std/containers/associative/map/out/refcount/map.access.rs @@ -0,0 +1,65 @@ +extern crate libcc2rs; +use libcc2rs::*; +use std::cell::RefCell; +use std::collections::BTreeMap; +use std::io::prelude::*; +use std::io::{Read, Seek, Write}; +use std::os::fd::AsFd; +use std::rc::{Rc, Weak}; +pub fn test_0() { + let m: Value, Value>)>> = Rc::new(RefCell::new(Map::new())); + let key: Value = Rc::new(RefCell::new(1)); + assert!( + ({ + (((*({ (*m.borrow_mut()).subscript(key.as_pointer(), || vec![0]) }) + .upgrade() + .deref()) + .len() + - 1) + == 0_usize) + }) + ); + assert!( + (((({ (*m.borrow_mut()).subscript(key.as_pointer(), || vec![0]) }) + .decay() + .read()) as i32) + == (('\0' as i8) as i32)) + ); + assert!(({ ((*m.borrow()).len() == 1_usize) })); +} +pub fn test_1() { + let m: Value, Value>)>> = Rc::new(RefCell::new(Map::new())); + assert!( + (((*match (Rc::new(RefCell::new(1)).as_pointer(),) { + (__tmp_0,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k), || vec![0]) }) + } + } + .upgrade() + .deref()) + .len() + - 1) + == 0_usize) + ); + assert!( + (((match (Rc::new(RefCell::new(1)).as_pointer(),) { + (__tmp_1,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k), || vec![0]) }) + } + } + .decay() + .read()) as i32) + == (('\0' as i8) as i32)) + ); + assert!(({ ((*m.borrow()).len() == 1_usize) })); +} +pub fn main() { + __cpp2rust_init_globals(); + libcc2rs::cpp2rust_exit(main_0()); +} +fn main_0() -> i32 { + ({ test_0() }); + ({ test_1() }); + return 0; +} +pub fn __cpp2rust_init_globals() {} diff --git a/tests/std/containers/associative/map/out/unsafe/map.access.rs b/tests/std/containers/associative/map/out/unsafe/map.access.rs new file mode 100644 index 0000000000..33079b9799 --- /dev/null +++ b/tests/std/containers/associative/map/out/unsafe/map.access.rs @@ -0,0 +1,41 @@ +extern crate libc; +use libc::*; +extern crate libcc2rs; +use libcc2rs::*; +use std::collections::BTreeMap; +use std::io::{Read, Seek, Write}; +use std::os::fd::{AsFd, FromRawFd, IntoRawFd}; +use std::rc::Rc; +pub unsafe fn test_0() { + let mut m: UnsafeMap)> = UnsafeMap::new(); + let mut key: i32 = 1; + assert!((((*m.subscript(&key, || vec![0])).len() - 1) == (0_usize))); + assert!( + (((*(*m.subscript(&key, || vec![0])).as_ptr()) as i32) == (('\0' as libc::c_char) as i32)) + ); + assert!(((m.len()) == (1_usize))); +} +pub unsafe fn test_1() { + let mut m: UnsafeMap)> = UnsafeMap::new(); + assert!( + (((*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || vec![0])).len() - 1) + == (0_usize)) + ); + assert!( + (((*(*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || vec![0])).as_ptr()) as i32) + == (('\0' as libc::c_char) as i32)) + ); + assert!(((m.len()) == (1_usize))); +} +pub fn main() { + unsafe { + __cpp2rust_init_globals(); + libcc2rs::cpp2rust_exit(main_0() as i32); + } +} +unsafe fn main_0() -> i32 { + (unsafe { test_0() }); + (unsafe { test_1() }); + return 0; +} +pub unsafe fn __cpp2rust_init_globals() {} diff --git a/tests/std/library/requirements/utility.requirements/allocator.requirements/out/refcount/allocator.requirements.general.rs b/tests/std/library/requirements/utility.requirements/allocator.requirements/out/refcount/allocator.requirements.general.rs index c0f89ff5ab..bf8e8701f0 100644 --- a/tests/std/library/requirements/utility.requirements/allocator.requirements/out/refcount/allocator.requirements.general.rs +++ b/tests/std/library/requirements/utility.requirements/allocator.requirements/out/refcount/allocator.requirements.general.rs @@ -24,7 +24,9 @@ pub fn test_0() { let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); let n: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(1)).as_pointer(),) { - (__tmp_0,) => ({ (*m.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k)) }), + (__tmp_0,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(2); { @@ -33,7 +35,7 @@ pub fn test_0() { assert!( ((match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_1,) => { - ({ (*n.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k)) }) + ({ (*n.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) @@ -47,13 +49,15 @@ pub struct p18_rebind_to_container_node_Alloc_std_pair_const_int__int__ {} pub fn test_1() { let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(1)).as_pointer(),) { - (__tmp_2,) => ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k)) }), + (__tmp_2,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(2); assert!( ((match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_3,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) diff --git a/tests/std/library/requirements/utility.requirements/allocator.requirements/out/unsafe/allocator.requirements.general.rs b/tests/std/library/requirements/utility.requirements/allocator.requirements/out/unsafe/allocator.requirements.general.rs index 9787fbd591..15e3c9030d 100644 --- a/tests/std/library/requirements/utility.requirements/allocator.requirements/out/unsafe/allocator.requirements.general.rs +++ b/tests/std/library/requirements/utility.requirements/allocator.requirements/out/unsafe/allocator.requirements.general.rs @@ -22,11 +22,11 @@ impl Default for p16_rebind_member_Alloc_std_pair_const_int__int__ { pub unsafe fn test_0() { let mut m: UnsafeMap = UnsafeMap::new(); let mut n: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) = 2; + (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 2; { n = std::mem::take(&mut m); }; - assert!(((*n.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) == (2))); + assert!(((*n.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) == (2))); assert!(((n.len()) == (1_usize))); } #[repr(C)] @@ -34,8 +34,8 @@ pub unsafe fn test_0() { pub struct p18_rebind_to_container_node_Alloc_std_pair_const_int__int__ {} pub unsafe fn test_1() { let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) = 2; - assert!(((*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) == (2))); + (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 2; + assert!(((*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) == (2))); assert!(((m.len()) == (1_usize))); } pub fn main() { diff --git a/tests/unit/out/refcount/clone_vs_move.rs b/tests/unit/out/refcount/clone_vs_move.rs index 99f4af4ce5..562e9a4327 100644 --- a/tests/unit/out/refcount/clone_vs_move.rs +++ b/tests/unit/out/refcount/clone_vs_move.rs @@ -223,7 +223,7 @@ fn main_0() -> i32 { let i: Value = Rc::new(RefCell::new(0)); 'loop_: while ((*i.borrow()) < N) { let __rhs = (*i.borrow()); - ({ (*map1.borrow_mut()).subscript(i.as_pointer()) }).write(__rhs); + ({ (*map1.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).write(__rhs); (*i.borrow_mut()).prefix_inc(); } } @@ -234,10 +234,11 @@ fn main_0() -> i32 { 'loop_: while ((*i.borrow()) < N) { assert!( ({ - ((({ (*map2.borrow_mut()).subscript(i.as_pointer()) }).read()) == (*i.borrow())) + ((({ (*map2.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).read()) + == (*i.borrow())) }) ); - ({ (*map2.borrow_mut()).subscript(i.as_pointer()) }).with_mut(|__v| { + ({ (*map2.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).with_mut(|__v| { __v.prefix_inc(); }); (*i.borrow_mut()).prefix_inc(); @@ -248,12 +249,13 @@ fn main_0() -> i32 { 'loop_: while ((*i.borrow()) < N) { assert!( ({ - ((({ (*map1.borrow_mut()).subscript(i.as_pointer()) }).read()) == (*i.borrow())) + ((({ (*map1.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).read()) + == (*i.borrow())) }) ); assert!( ({ - ((({ (*map2.borrow_mut()).subscript(i.as_pointer()) }).read()) + ((({ (*map2.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).read()) == ((*i.borrow()) + 1)) }) ); diff --git a/tests/unit/out/refcount/container_element_receiver.rs b/tests/unit/out/refcount/container_element_receiver.rs index e54d9d42ec..53976b9137 100644 --- a/tests/unit/out/refcount/container_element_receiver.rs +++ b/tests/unit/out/refcount/container_element_receiver.rs @@ -92,14 +92,28 @@ fn main_0() -> i32 { { let __a1 = 8; match (Rc::new(RefCell::new(1)).as_pointer(),) { - (__tmp_1,) => ({ (*m.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k)) }), + (__tmp_1,) => { + ({ + (*m.borrow_mut()).subscript_move( + __tmp_1, + |__k| cpp_move!(__k), + || Default::default(), + ) + }) + } } .with_mut(|__v: &mut Vec| __v.push(__a1)) }; assert!( ((match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_2,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k)) }) + ({ + (*m.borrow_mut()).subscript_move( + __tmp_2, + |__k| cpp_move!(__k), + || Default::default(), + ) + }) } } .decay() diff --git a/tests/unit/out/refcount/find.rs b/tests/unit/out/refcount/find.rs index 00b4db89bb..42b0975704 100644 --- a/tests/unit/out/refcount/find.rs +++ b/tests/unit/out/refcount/find.rs @@ -56,15 +56,21 @@ fn main_0() -> i32 { let mut v_result_true: bool = (*it.borrow()) != v.decay().end(); let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(1)).as_pointer(),) { - (__tmp_2,) => ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k)) }), + (__tmp_2,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k), || 0_f64) }) + } } .write(1_f64); match (Rc::new(RefCell::new(2)).as_pointer(),) { - (__tmp_3,) => ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k)) }), + (__tmp_3,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k), || 0_f64) }) + } } .write(2_f64); match (Rc::new(RefCell::new(3)).as_pointer(),) { - (__tmp_4,) => ({ (*m.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k)) }), + (__tmp_4,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k), || 0_f64) }) + } } .write(3_f64); let m_begin: Value, Value)>> = Rc::new(RefCell::new( diff --git a/tests/unit/out/refcount/foreach_map.rs b/tests/unit/out/refcount/foreach_map.rs index 5d084bd8fa..613477c0ea 100644 --- a/tests/unit/out/refcount/foreach_map.rs +++ b/tests/unit/out/refcount/foreach_map.rs @@ -16,7 +16,7 @@ fn main_0() -> i32 { let i: Value = Rc::new(RefCell::new(0)); let mut k: i32 = 100; 'loop_: while ((*i.borrow()) < 100) { - ({ (*m.borrow_mut()).subscript(i.as_pointer()) }).write(((k as f64) / 2_f64)); + ({ (*m.borrow_mut()).subscript(i.as_pointer(), || 0_f64) }).write(((k as f64) / 2_f64)); { (*i.borrow_mut()).prefix_inc(); k.prefix_dec() diff --git a/tests/unit/out/refcount/map-reallocation.rs b/tests/unit/out/refcount/map-reallocation.rs index 105664beb9..35d272a190 100644 --- a/tests/unit/out/refcount/map-reallocation.rs +++ b/tests/unit/out/refcount/map-reallocation.rs @@ -15,7 +15,7 @@ fn main_0() -> i32 { let sentinel: Value = Rc::new(RefCell::new((N / 2))); let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); let __rhs = (*sentinel.borrow()); - ({ (*m.borrow_mut()).subscript(sentinel.as_pointer()) }).write(__rhs); + ({ (*m.borrow_mut()).subscript(sentinel.as_pointer(), || 0_i32) }).write(__rhs); let it: Value, Value)>> = Rc::new(RefCell::new( m.as_pointer() .with(|__m: &Map, Value)>| __m.find(&sentinel.as_pointer())), @@ -48,7 +48,7 @@ fn main_0() -> i32 { let i: Value = Rc::new(RefCell::new(0)); 'loop_: while ((*i.borrow()) < (*sentinel.borrow())) { let __rhs = (*i.borrow()); - ({ (*m.borrow_mut()).subscript(i.as_pointer()) }).write(__rhs); + ({ (*m.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).write(__rhs); (*i.borrow_mut()).prefix_inc(); } } @@ -56,7 +56,7 @@ fn main_0() -> i32 { let i: Value = Rc::new(RefCell::new(((*sentinel.borrow()) + 1))); 'loop_: while ((*i.borrow()) <= N) { let __rhs = (*i.borrow()); - ({ (*m.borrow_mut()).subscript(i.as_pointer()) }).write(__rhs); + ({ (*m.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).write(__rhs); (*i.borrow_mut()).prefix_inc(); } } @@ -96,7 +96,7 @@ fn main_0() -> i32 { (*(*({ (*it.borrow()).iter_deref() }).upgrade().deref()) .1 .borrow_mut()) = 57005; - assert!(((({ (*m.borrow_mut()).subscript(sentinel.as_pointer()) }).read()) == 57005)); + assert!(((({ (*m.borrow_mut()).subscript(sentinel.as_pointer(), || 0_i32) }).read()) == 57005)); assert!(((p.read()) == 57005)); assert!(({ ((*m.borrow()).len() == (((N + 1) as u32) as usize)) })); let mut prev: i32 = -1_i32; diff --git a/tests/unit/out/refcount/map.rs b/tests/unit/out/refcount/map.rs index 58976c16a5..64a03b38a5 100644 --- a/tests/unit/out/refcount/map.rs +++ b/tests/unit/out/refcount/map.rs @@ -40,22 +40,28 @@ pub fn main() { fn main_0() -> i32 { let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { - (__tmp_0,) => ({ (*m.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k)) }), + (__tmp_0,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(1_u32); match (Rc::new(RefCell::new(1_i16)).as_pointer(),) { - (__tmp_1,) => ({ (*m.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k)) }), + (__tmp_1,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(2_u32); match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { - (__tmp_2,) => ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k)) }), + (__tmp_2,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(3_u32); assert!(({ ((*m.borrow()).len() == 3_usize) })); assert!( ((match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { (__tmp_3,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -64,7 +70,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(1_i16)).as_pointer(),) { (__tmp_4,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -73,7 +79,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { (__tmp_5,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -81,14 +87,16 @@ fn main_0() -> i32 { ); let mut x: i32 = 4; match (Rc::new(RefCell::new(1_i16)).as_pointer(),) { - (__tmp_6,) => ({ (*m.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k)) }), + (__tmp_6,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k), || 0_u32) }) + } } .write((x as u32)); assert!(({ ((*m.borrow()).len() == 3_usize) })); assert!( ((match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { (__tmp_7,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_7, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_7, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -97,7 +105,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(1_i16)).as_pointer(),) { (__tmp_8,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_8, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_8, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -106,7 +114,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { (__tmp_9,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_9, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_9, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -116,7 +124,7 @@ fn main_0() -> i32 { foo_0( (match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { (__tmp_10,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_10, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_10, |__k| cpp_move!(__k), || 0_u32) }) } } .read()), @@ -125,7 +133,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { (__tmp_11,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_11, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_11, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -133,36 +141,44 @@ fn main_0() -> i32 { ); ({ bar_1(match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { - (__tmp_12,) => ({ (*m.borrow_mut()).subscript_move(__tmp_12, |__k| cpp_move!(__k)) }), + (__tmp_12,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_12, |__k| cpp_move!(__k), || 0_u32) }) + } }) }); assert!( ((match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { (__tmp_13,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_13, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_13, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) == 4_u32) ); let __rhs = (match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { - (__tmp_14,) => ({ (*m.borrow_mut()).subscript_move(__tmp_14, |__k| cpp_move!(__k)) }), + (__tmp_14,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_14, |__k| cpp_move!(__k), || 0_u32) }) + } } .read()) .wrapping_add( (match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { - (__tmp_15,) => ({ (*m.borrow_mut()).subscript_move(__tmp_15, |__k| cpp_move!(__k)) }), + (__tmp_15,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_15, |__k| cpp_move!(__k), || 0_u32) }) + } } .read()), ); match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { - (__tmp_16,) => ({ (*m.borrow_mut()).subscript_move(__tmp_16, |__k| cpp_move!(__k)) }), + (__tmp_16,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_16, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(__rhs); assert!( ((match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { (__tmp_17,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_17, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_17, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -232,7 +248,9 @@ fn main_0() -> i32 { }; assert!((x4 == 0_u32)); match (Rc::new(RefCell::new(4_i16)).as_pointer(),) { - (__tmp_20,) => ({ (*m.borrow_mut()).subscript_move(__tmp_20, |__k| cpp_move!(__k)) }), + (__tmp_20,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_20, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(5_u32); let it4: Value, Value)>> = Rc::new(RefCell::new( @@ -249,7 +267,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(4_i16)).as_pointer(),) { (__tmp_22,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_22, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_22, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -271,7 +289,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(4_i16)).as_pointer(),) { (__tmp_23,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_23, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_23, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -329,15 +347,21 @@ fn main_0() -> i32 { .with(|__m: &Map, Value)>| __m.end()) ); match (Rc::new(RefCell::new(7_i16)).as_pointer(),) { - (__tmp_27,) => ({ (*m.borrow_mut()).subscript_move(__tmp_27, |__k| cpp_move!(__k)) }), + (__tmp_27,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_27, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(7_u32); match (Rc::new(RefCell::new(8_i16)).as_pointer(),) { - (__tmp_28,) => ({ (*m.borrow_mut()).subscript_move(__tmp_28, |__k| cpp_move!(__k)) }), + (__tmp_28,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_28, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(8_u32); match (Rc::new(RefCell::new(9_i16)).as_pointer(),) { - (__tmp_29,) => ({ (*m.borrow_mut()).subscript_move(__tmp_29, |__k| cpp_move!(__k)) }), + (__tmp_29,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_29, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(9_u32); assert!(({ ((*r.upgrade().deref()).len() == 6_usize) })); @@ -407,18 +431,18 @@ fn main_0() -> i32 { ))); let mut value: f64 = 2_f64; match (key0.as_pointer(),) { - (__tmp_35,) => ({ (*other_map.borrow_mut()).subscript(__tmp_35) }), + (__tmp_35,) => ({ (*other_map.borrow_mut()).subscript(__tmp_35, || 0_f64) }), } .write(value); value = (match (key0.as_pointer(),) { - (__tmp_36,) => ({ (*other_map.borrow_mut()).subscript(__tmp_36) }), + (__tmp_36,) => ({ (*other_map.borrow_mut()).subscript(__tmp_36, || 0_f64) }), } .read()); assert!(({ ((*other_map.borrow()).len() == 1_usize) })); assert!( ((match (key0.as_pointer(),) { (__tmp_37,) => { - ({ (*other_map.borrow_mut()).subscript(__tmp_37) }) + ({ (*other_map.borrow_mut()).subscript(__tmp_37, || 0_f64) }) } } .read()) @@ -502,7 +526,7 @@ fn main_0() -> i32 { 'loop_: while ((i as usize) < (*indexes.borrow()).len()) { let __rhs = ((i).wrapping_rem(2_u32) != 0); match (indexes.decay().offset((i as usize)),) { - (__tmp_41,) => ({ (*m2.borrow_mut()).subscript(__tmp_41) }), + (__tmp_41,) => ({ (*m2.borrow_mut()).subscript(__tmp_41, || false) }), } .write(__rhs); i.prefix_inc(); @@ -598,7 +622,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_43,) => { - ({ (*m3.borrow_mut()).subscript_move(__tmp_43, |__k| cpp_move!(__k)) }) + ({ (*m3.borrow_mut()).subscript_move(__tmp_43, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) @@ -607,7 +631,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(4)).as_pointer(),) { (__tmp_44,) => { - ({ (*m3.borrow_mut()).subscript_move(__tmp_44, |__k| cpp_move!(__k)) }) + ({ (*m3.borrow_mut()).subscript_move(__tmp_44, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) @@ -676,7 +700,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(8)).as_pointer(),) { (__tmp_45,) => { - ({ (*m3.borrow_mut()).subscript_move(__tmp_45, |__k| cpp_move!(__k)) }) + ({ (*m3.borrow_mut()).subscript_move(__tmp_45, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) @@ -703,7 +727,13 @@ fn main_0() -> i32 { assert!( (match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_46,) => { - ({ (*points.borrow_mut()).subscript_move(__tmp_46, |__k| cpp_move!(__k)) }) + ({ + (*points.borrow_mut()).subscript_move( + __tmp_46, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.x) @@ -712,7 +742,13 @@ fn main_0() -> i32 { assert!( (match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_47,) => { - ({ (*points.borrow_mut()).subscript_move(__tmp_47, |__k| cpp_move!(__k)) }) + ({ + (*points.borrow_mut()).subscript_move( + __tmp_47, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.y) @@ -733,7 +769,13 @@ fn main_0() -> i32 { assert!( (match (Rc::new(RefCell::new(8)).as_pointer(),) { (__tmp_48,) => { - ({ (*points.borrow_mut()).subscript_move(__tmp_48, |__k| cpp_move!(__k)) }) + ({ + (*points.borrow_mut()).subscript_move( + __tmp_48, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.x) @@ -742,7 +784,13 @@ fn main_0() -> i32 { assert!( (match (Rc::new(RefCell::new(8)).as_pointer(),) { (__tmp_49,) => { - ({ (*points.borrow_mut()).subscript_move(__tmp_49, |__k| cpp_move!(__k)) }) + ({ + (*points.borrow_mut()).subscript_move( + __tmp_49, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.y) @@ -805,21 +853,31 @@ fn main_0() -> i32 { let ptr_counts: Value, (Value>, Value)>> = Rc::new(RefCell::new(Map::new())); let ptr_key: Value> = Rc::new(RefCell::new((pk1.as_pointer()))); - ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer()) }).write(1); + ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer(), || 0_i32) }).write(1); (*ptr_key.borrow_mut()) = (pk2.as_pointer()); - ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer()) }).write(2); + ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer(), || 0_i32) }).write(2); { - ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer()) }) + ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer(), || 0_i32) }) .with_mut(|__v| *__v = *__v + 3) }; assert!(({ ((*ptr_counts.borrow()).len() == 2_usize) })); - assert!(((({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer()) }).read()) == 5)); + assert!( + ((({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer(), || 0_i32) }).read()) == 5) + ); (*ptr_key.borrow_mut()) = (pk1.as_pointer()); - assert!(((({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer()) }).read()) == 1)); + assert!( + ((({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer(), || 0_i32) }).read()) == 1) + ); { match (Rc::new(RefCell::new((pk2.as_pointer()))).as_pointer(),) { (__tmp_51,) => { - ({ (*ptr_counts.borrow_mut()).subscript_move(__tmp_51, |__k| cpp_move!(__k)) }) + ({ + (*ptr_counts.borrow_mut()).subscript_move( + __tmp_51, + |__k| cpp_move!(__k), + || 0_i32, + ) + }) } } .with_mut(|__v| *__v = *__v + 1) @@ -827,7 +885,13 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new((pk2.as_pointer()))).as_pointer(),) { (__tmp_52,) => { - ({ (*ptr_counts.borrow_mut()).subscript_move(__tmp_52, |__k| cpp_move!(__k)) }) + ({ + (*ptr_counts.borrow_mut()).subscript_move( + __tmp_52, + |__k| cpp_move!(__k), + || 0_i32, + ) + }) } } .read()) diff --git a/tests/unit/out/refcount/map_copy.rs b/tests/unit/out/refcount/map_copy.rs index a5883ea477..985138249f 100644 --- a/tests/unit/out/refcount/map_copy.rs +++ b/tests/unit/out/refcount/map_copy.rs @@ -13,18 +13,22 @@ pub fn main() { fn main_0() -> i32 { let a: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(1)).as_pointer(),) { - (__tmp_0,) => ({ (*a.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k)) }), + (__tmp_0,) => { + ({ (*a.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(10); let b: Value, Value)>> = Rc::new(RefCell::new((*a.borrow()).clone())); match (Rc::new(RefCell::new(1)).as_pointer(),) { - (__tmp_1,) => ({ (*b.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k)) }), + (__tmp_1,) => { + ({ (*b.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(20); assert!( ((match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_2,) => { - ({ (*a.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k)) }) + ({ (*a.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) @@ -32,18 +36,22 @@ fn main_0() -> i32 { ); let x: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(2)).as_pointer(),) { - (__tmp_3,) => ({ (*x.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k)) }), + (__tmp_3,) => { + ({ (*x.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(3); let y: Value, Value)>> = Rc::new(RefCell::new((*x.borrow()).clone())); match (Rc::new(RefCell::new(2)).as_pointer(),) { - (__tmp_4,) => ({ (*y.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k)) }), + (__tmp_4,) => { + ({ (*y.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(4); assert!( ((match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_5,) => { - ({ (*x.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k)) }) + ({ (*x.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) diff --git a/tests/unit/out/refcount/map_key_copy_ctor.rs b/tests/unit/out/refcount/map_key_copy_ctor.rs index a017069673..af258224e5 100644 --- a/tests/unit/out/refcount/map_key_copy_ctor.rs +++ b/tests/unit/out/refcount/map_key_copy_ctor.rs @@ -73,17 +73,17 @@ fn main_0() -> i32 { let b: Value = Rc::new(RefCell::new(Key::new({ 2 }))); let c: Value = Rc::new(RefCell::new(Key::new({ 3 }))); match (a.as_pointer(),) { - (__tmp_0,) => ({ (*m.borrow_mut()).subscript(__tmp_0) }), + (__tmp_0,) => ({ (*m.borrow_mut()).subscript(__tmp_0, || 0_i32) }), } .write(10); ok = { ((ok as i32) & ((copies_0.with(|rc| *rc.borrow()) == 1) as i32)) != 0 }; match (b.as_pointer(),) { - (__tmp_1,) => ({ (*m.borrow_mut()).subscript(__tmp_1) }), + (__tmp_1,) => ({ (*m.borrow_mut()).subscript(__tmp_1, || 0_i32) }), } .write(20); ok = { ((ok as i32) & ((copies_0.with(|rc| *rc.borrow()) == 2) as i32)) != 0 }; match (a.as_pointer(),) { - (__tmp_2,) => ({ (*m.borrow_mut()).subscript(__tmp_2) }), + (__tmp_2,) => ({ (*m.borrow_mut()).subscript(__tmp_2, || 0_i32) }), } .write(11); ok = { ((ok as i32) & ((copies_0.with(|rc| *rc.borrow()) == 2) as i32)) != 0 }; @@ -118,11 +118,15 @@ fn main_0() -> i32 { }; ok = { ((ok as i32) & ((copies_0.with(|rc| *rc.borrow()) == 2) as i32)) != 0 }; match (Rc::new(RefCell::new(({ make_key_3(4) }))).as_pointer(),) { - (__tmp_3,) => ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k)) }), + (__tmp_3,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(40); match (Rc::new(RefCell::new(({ make_key_3(4) }))).as_pointer(),) { - (__tmp_4,) => ({ (*m.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k)) }), + (__tmp_4,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(41); ok = { @@ -132,11 +136,15 @@ fn main_0() -> i32 { != 0 }; match (c.as_pointer(),) { - (__tmp_5,) => ({ (*m.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k)) }), + (__tmp_5,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(30); match (c.as_pointer(),) { - (__tmp_6,) => ({ (*m.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k)) }), + (__tmp_6,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(31); ok = { @@ -159,7 +167,7 @@ fn main_0() -> i32 { .0 .as_pointer(),) { - (__tmp_7,) => ({ (*m.borrow_mut()).subscript(__tmp_7) }), + (__tmp_7,) => ({ (*m.borrow_mut()).subscript(__tmp_7, || 0_i32) }), } .with_mut(|__v| *__v = *__v + 1) }; @@ -167,7 +175,7 @@ fn main_0() -> i32 { let rhs_0 = ((ok as i32) & (((copies_0.with(|rc| *rc.borrow()) == 2) && ((match (a.as_pointer(),) { - (__tmp_8,) => ({ (*m.borrow_mut()).subscript(__tmp_8) }), + (__tmp_8,) => ({ (*m.borrow_mut()).subscript(__tmp_8, || 0_i32) }), } .read()) == 12)) as i32)) @@ -183,7 +191,9 @@ fn main_0() -> i32 { .0 .as_pointer()); match (Rc::new(RefCell::new(Key::new({ 0 }))).as_pointer(),) { - (__tmp_9,) => ({ (*m.borrow_mut()).subscript_move(__tmp_9, |__k| cpp_move!(__k)) }), + (__tmp_9,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_9, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(0); ok = { ((ok as i32) & ((moves_1.with(|rc| *rc.borrow()) == 3) as i32)) != 0 }; @@ -207,7 +217,7 @@ fn main_0() -> i32 { let rhs_0 = ((ok as i32) & ((((*n.borrow()).len() == 5_usize) && ((match (a.as_pointer(),) { - (__tmp_10,) => ({ (*n.borrow_mut()).subscript(__tmp_10) }), + (__tmp_10,) => ({ (*n.borrow_mut()).subscript(__tmp_10, || 0_i32) }), } .read()) == 12)) as i32)) diff --git a/tests/unit/out/refcount/map_key_identity.rs b/tests/unit/out/refcount/map_key_identity.rs index b5dd95b028..8d9695dd17 100644 --- a/tests/unit/out/refcount/map_key_identity.rs +++ b/tests/unit/out/refcount/map_key_identity.rs @@ -75,7 +75,8 @@ fn main_0() -> i32 { ok = rhs_0 }; let distinct: Value, Value)>> = Rc::new(RefCell::new(Map::new())); - let a: Ptr = ({ (*distinct.borrow_mut()).subscript(distinct_a.as_pointer()) }); + let a: Ptr = + ({ (*distinct.borrow_mut()).subscript(distinct_a.as_pointer(), || ::default()) }); field!(a, value).write(11); let a_it: Value, Value)>> = Rc::new(RefCell::new(distinct.as_pointer().with( @@ -85,7 +86,8 @@ fn main_0() -> i32 { .1 .as_pointer()); ok = { ((ok as i32) & ((default_constructions_0.with(|rc| *rc.borrow()) == 1) as i32)) != 0 }; - let b: Ptr = ({ (*distinct.borrow_mut()).subscript(distinct_b.as_pointer()) }); + let b: Ptr = + ({ (*distinct.borrow_mut()).subscript(distinct_b.as_pointer(), || ::default()) }); field!(b, value).write(22); let b_it: Value, Value)>> = Rc::new(RefCell::new(distinct.as_pointer().with( @@ -210,7 +212,9 @@ fn main_0() -> i32 { let equivalent: Value, Value)>> = Rc::new(RefCell::new(Map::new())); let mut before_equivalent: i32 = default_constructions_0.with(|rc| *rc.borrow()); - let first: Ptr = ({ (*equivalent.borrow_mut()).subscript(equivalent_a.as_pointer()) }); + let first: Ptr = ({ + (*equivalent.borrow_mut()).subscript(equivalent_a.as_pointer(), || ::default()) + }); field!(first, value).write(31); let first_it: Value, Value)>> = Rc::new(RefCell::new(equivalent.as_pointer().with( @@ -225,7 +229,9 @@ fn main_0() -> i32 { & ((default_constructions_0.with(|rc| *rc.borrow()) == (before_equivalent + 1)) as i32)) != 0 }; - let second: Ptr = ({ (*equivalent.borrow_mut()).subscript(equivalent_b.as_pointer()) }); + let second: Ptr = ({ + (*equivalent.borrow_mut()).subscript(equivalent_b.as_pointer(), || ::default()) + }); let mut reused: bool = (default_constructions_0.with(|rc| *rc.borrow()) == (before_equivalent + 1)); ok = { ((ok as i32) & (reused as i32)) != 0 }; @@ -319,7 +325,8 @@ fn main_0() -> i32 { order: 4, identity: 10, })); - let later: Ptr = ({ (*equivalent.borrow_mut()).subscript(later_key.as_pointer()) }); + let later: Ptr = + ({ (*equivalent.borrow_mut()).subscript(later_key.as_pointer(), || ::default()) }); field!(later, value).write(41); ok = { ((ok as i32) @@ -374,7 +381,8 @@ fn main_0() -> i32 { })); let mut before_matching: i32 = default_constructions_0.with(|rc| *rc.borrow()); let matching: Value, Value)>> = Rc::new(RefCell::new(Map::new())); - let matched: Ptr = ({ (*matching.borrow_mut()).subscript(matching_a.as_pointer()) }); + let matched: Ptr = + ({ (*matching.borrow_mut()).subscript(matching_a.as_pointer(), || ::default()) }); field!(matched, value).write(51); let matched_it: Value, Value)>> = Rc::new(RefCell::new(matching.as_pointer().with( @@ -390,7 +398,7 @@ fn main_0() -> i32 { != 0 }; let matched_again: Ptr = - ({ (*matching.borrow_mut()).subscript(matching_b.as_pointer()) }); + ({ (*matching.borrow_mut()).subscript(matching_b.as_pointer(), || ::default()) }); ok = { ((ok as i32) & ((default_constructions_0.with(|rc| *rc.borrow()) == (before_matching + 1)) as i32)) @@ -429,7 +437,8 @@ fn main_0() -> i32 { != 0; ok = rhs_0 }; - let other: Ptr = ({ (*matching.borrow_mut()).subscript(matching_c.as_pointer()) }); + let other: Ptr = + ({ (*matching.borrow_mut()).subscript(matching_c.as_pointer(), || ::default()) }); field!(other, value).write(61); ok = { ((ok as i32) diff --git a/tests/unit/out/refcount/map_try_emplace.rs b/tests/unit/out/refcount/map_try_emplace.rs index 30b07ecc95..d9b9543786 100644 --- a/tests/unit/out/refcount/map_try_emplace.rs +++ b/tests/unit/out/refcount/map_try_emplace.rs @@ -114,7 +114,7 @@ thread_local!( pub static seed_9: Value = Rc::new(RefCell::new({ ({ (*global_map_6.with(Value::clone).borrow_mut()) - .subscript(global_key_7.with(|v| v.as_pointer())) + .subscript(global_key_7.with(|v| v.as_pointer()), || 0_i32) }) .write(10); 0 @@ -186,8 +186,11 @@ fn main_0() -> i32 { 'loop_: while ((*k.borrow()) < 3) { if ((subset & (1 << (*k.borrow()))) != 0) { let __rhs = (10 + (*k.borrow())); - ({ (*m.borrow_mut()).subscript(k.as_pointer()) }) - .write(__rhs); + ({ + (*m.borrow_mut()) + .subscript(k.as_pointer(), || 0_i32) + }) + .write(__rhs); size.prefix_inc(); } (*k.borrow_mut()).prefix_inc(); diff --git a/tests/unit/out/refcount/map_try_emplace_lvalues.rs b/tests/unit/out/refcount/map_try_emplace_lvalues.rs index c6a07b2319..e6c612c46a 100644 --- a/tests/unit/out/refcount/map_try_emplace_lvalues.rs +++ b/tests/unit/out/refcount/map_try_emplace_lvalues.rs @@ -750,7 +750,7 @@ fn main_0() -> i32 { }) ); let changed: Value, Value)>> = Rc::new(RefCell::new(Map::new())); - ({ (*changed.borrow_mut()).subscript(key.as_pointer()) }).write(10); + ({ (*changed.borrow_mut()).subscript(key.as_pointer(), || 0_i32) }).write(10); let effects: Value = Rc::new(RefCell::new(0)); let erased: Value<( Value, Value)>>, @@ -798,7 +798,7 @@ fn main_0() -> i32 { Value, )> = Rc::new(RefCell::new( match ({ - ({ (*changed.borrow_mut()).subscript(key.as_pointer()) }).with_mut(|__v| { + ({ (*changed.borrow_mut()).subscript(key.as_pointer(), || 0_i32) }).with_mut(|__v| { __v.prefix_inc(); }); { @@ -888,7 +888,7 @@ fn main_0() -> i32 { 'loop_: for k in IterRange::new(keys.decay(), keys.decay().offset((6_i64) as isize)) { let k: Value = Rc::new(RefCell::new((k.read()))); - ({ (*values.borrow_mut()).subscript(k.as_pointer()) }).write(42); + ({ (*values.borrow_mut()).subscript(k.as_pointer(), || 0_i32) }).write(42); } } let moved: Value = Rc::new(RefCell::new(0)); @@ -1081,7 +1081,7 @@ fn main_0() -> i32 { let k: Value = Rc::new(RefCell::new((k.read()))); assert!( ({ - ((({ (*values.borrow_mut()).subscript(k.as_pointer()) }).read()) + ((({ (*values.borrow_mut()).subscript(k.as_pointer(), || 0_i32) }).read()) == (if (hit != 0) { 42 } else { @@ -1108,7 +1108,10 @@ fn main_0() -> i32 { { let k: Value = Rc::new(RefCell::new((k.read()))); field!( - ({ (*selected.borrow_mut()).subscript(k.as_pointer()) }), + ({ + (*selected.borrow_mut()) + .subscript(k.as_pointer(), || ::default()) + }), value ) .write(42); @@ -1345,7 +1348,7 @@ fn main_0() -> i32 { 'loop_: for k in IterRange::new(keys.decay(), keys.decay().offset((3_i64) as isize)) { let k: Value = Rc::new(RefCell::new((k.read()))); - ({ (*values.borrow_mut()).subscript(k.as_pointer()) }).write(42); + ({ (*values.borrow_mut()).subscript(k.as_pointer(), || 0_i32) }).write(42); } } let mut before: i32 = temporary_calls_4.with(|rc| *rc.borrow()); @@ -1528,10 +1531,12 @@ fn main_0() -> i32 { ) } }; - let __rhs = - (({ (*references.borrow_mut()).subscript(key.as_pointer()) }) - .with(|__s| __s.ptr.clone()) - .read()); + let __rhs = (({ + (*references.borrow_mut()) + .subscript(key.as_pointer(), || ::default()) + }) + .with(|__s| __s.ptr.clone()) + .read()); value = __rhs } }; @@ -1611,8 +1616,11 @@ fn main_0() -> i32 { } }; let __rhs = (elem!( - ({ (*arrays.borrow_mut()).subscript(key.as_pointer()) }) - .with(|__s| __s.ptr.clone()), + ({ + (*arrays.borrow_mut()) + .subscript(key.as_pointer(), || ::default()) + }) + .with(|__s| __s.ptr.clone()), 1 ) .read()); @@ -1639,7 +1647,7 @@ fn main_0() -> i32 { 'loop_: for k in IterRange::new(keys.decay(), keys.decay().offset((6_i64) as isize)) { let k: Value = Rc::new(RefCell::new((k.read()))); - ({ (*values.borrow_mut()).subscript(k.as_pointer()) }).write(42); + ({ (*values.borrow_mut()).subscript(k.as_pointer(), || 0_i32) }).write(42); } } let mut before: i32 = temporary_calls_4.with(|rc| *rc.borrow()); @@ -1842,7 +1850,7 @@ fn main_0() -> i32 { let k: Value = Rc::new(RefCell::new((k.read()))); assert!( ({ - ((({ (*values.borrow_mut()).subscript(k.as_pointer()) }).read()) + ((({ (*values.borrow_mut()).subscript(k.as_pointer(), || 0_i32) }).read()) == (if (hit != 0) { 42 } else { @@ -1921,10 +1929,12 @@ fn main_0() -> i32 { ) } }; - let __rhs = - (({ (*references.borrow_mut()).subscript(key.as_pointer()) }) - .with(|__s| __s.ptr.clone()) - .read()); + let __rhs = (({ + (*references.borrow_mut()) + .subscript(key.as_pointer(), || ::default()) + }) + .with(|__s| __s.ptr.clone()) + .read()); value = __rhs } }; @@ -1971,9 +1981,12 @@ fn main_0() -> i32 { ) } }; - let __rhs = (({ (*owners.borrow_mut()).subscript(key.as_pointer()) }) - .with(|__s| __s.ptr.clone()) - .read()); + let __rhs = (({ + (*owners.borrow_mut()) + .subscript(key.as_pointer(), || ::default()) + }) + .with(|__s| __s.ptr.clone()) + .read()); value = __rhs } }; diff --git a/tests/unit/out/refcount/operator_traits.rs b/tests/unit/out/refcount/operator_traits.rs index 0abab18732..f4296a7f22 100644 --- a/tests/unit/out/refcount/operator_traits.rs +++ b/tests/unit/out/refcount/operator_traits.rs @@ -205,11 +205,15 @@ fn main_0() -> i32 { ); let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(Lt { v: 2 })).as_pointer(),) { - (__tmp_11,) => ({ (*m.borrow_mut()).subscript_move(__tmp_11, |__k| cpp_move!(__k)) }), + (__tmp_11,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_11, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(20); match (Rc::new(RefCell::new(Lt { v: 1 })).as_pointer(),) { - (__tmp_12,) => ({ (*m.borrow_mut()).subscript_move(__tmp_12, |__k| cpp_move!(__k)) }), + (__tmp_12,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_12, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(10); assert!( @@ -226,7 +230,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(Lt { v: 2 })).as_pointer(),) { (__tmp_13,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_13, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_13, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) diff --git a/tests/unit/out/refcount/redundant_copy_in_conversion.rs b/tests/unit/out/refcount/redundant_copy_in_conversion.rs index 85efb6ce54..dae2a118b8 100644 --- a/tests/unit/out/refcount/redundant_copy_in_conversion.rs +++ b/tests/unit/out/refcount/redundant_copy_in_conversion.rs @@ -28,7 +28,9 @@ pub fn main() { fn main_0() -> i32 { let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(0)).as_pointer(),) { - (__tmp_0,) => ({ (*m.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k)) }), + (__tmp_0,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(1); let end: Value, Value)>> = Rc::new(RefCell::new( diff --git a/tests/unit/out/refcount/sort_no_copy.rs b/tests/unit/out/refcount/sort_no_copy.rs index 15f300cf5d..2b732f40f9 100644 --- a/tests/unit/out/refcount/sort_no_copy.rs +++ b/tests/unit/out/refcount/sort_no_copy.rs @@ -390,11 +390,15 @@ fn main_0() -> i32 { assert!((copies_0.with(|rc| *rc.borrow()) == 0)); let bag_map: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (bag_vec.decay().offset(2_usize),) { - (__tmp_11,) => ({ (*bag_map.borrow_mut()).subscript_move(__tmp_11, |__k| cpp_move!(__k)) }), + (__tmp_11,) => { + ({ (*bag_map.borrow_mut()).subscript_move(__tmp_11, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(2); match (bag_vec.decay().offset(0_usize),) { - (__tmp_12,) => ({ (*bag_map.borrow_mut()).subscript_move(__tmp_12, |__k| cpp_move!(__k)) }), + (__tmp_12,) => { + ({ (*bag_map.borrow_mut()).subscript_move(__tmp_12, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(0); assert!( diff --git a/tests/unit/out/refcount/swap_map_no_copy.rs b/tests/unit/out/refcount/swap_map_no_copy.rs index 73db82a008..2791bea5b6 100644 --- a/tests/unit/out/refcount/swap_map_no_copy.rs +++ b/tests/unit/out/refcount/swap_map_no_copy.rs @@ -262,7 +262,13 @@ fn main_0() -> i32 { TrackedImpl::move_assign( &match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_0,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_0, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } }, _o.as_pointer(), @@ -273,7 +279,13 @@ fn main_0() -> i32 { TrackedImpl::move_assign( &match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_1,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_1, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } }, _o.as_pointer(), @@ -285,7 +297,13 @@ fn main_0() -> i32 { TrackedImpl::move_assign( &match (Rc::new(RefCell::new(3)).as_pointer(),) { (__tmp_2,) => { - ({ (*m2.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k)) }) + ({ + (*m2.borrow_mut()).subscript_move( + __tmp_2, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } }, _o.as_pointer(), @@ -295,26 +313,50 @@ fn main_0() -> i32 { cpp_swap!( match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_3,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_3, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } }, match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_4,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_4, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } ); assert!( (match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_5,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_5, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.v) == 20) && (match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_6,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_6, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.v) @@ -326,7 +368,13 @@ fn main_0() -> i32 { ((*m1.borrow()).len() == 1_usize) && (match (Rc::new(RefCell::new(3)).as_pointer(),) { (__tmp_7,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_7, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_7, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.v) @@ -336,14 +384,26 @@ fn main_0() -> i32 { (((*m2.borrow()).len() == 2_usize) && (match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_8,) => { - ({ (*m2.borrow_mut()).subscript_move(__tmp_8, |__k| cpp_move!(__k)) }) + ({ + (*m2.borrow_mut()).subscript_move( + __tmp_8, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.v) == 20)) && (match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_9,) => { - ({ (*m2.borrow_mut()).subscript_move(__tmp_9, |__k| cpp_move!(__k)) }) + ({ + (*m2.borrow_mut()).subscript_move( + __tmp_9, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.v) @@ -480,8 +540,11 @@ fn main_0() -> i32 { &match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_10,) => { ({ - (*maps.borrow_mut())[(0) as usize] - .subscript_move(__tmp_10, |__k| cpp_move!(__k)) + (*maps.borrow_mut())[(0) as usize].subscript_move( + __tmp_10, + |__k| cpp_move!(__k), + || ::default(), + ) }) } }, @@ -494,8 +557,11 @@ fn main_0() -> i32 { &match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_11,) => { ({ - (*maps.borrow_mut())[(1) as usize] - .subscript_move(__tmp_11, |__k| cpp_move!(__k)) + (*maps.borrow_mut())[(1) as usize].subscript_move( + __tmp_11, + |__k| cpp_move!(__k), + || ::default(), + ) }) } }, @@ -508,8 +574,11 @@ fn main_0() -> i32 { && (match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_12,) => { ({ - (*maps.borrow_mut())[(0) as usize] - .subscript_move(__tmp_12, |__k| cpp_move!(__k)) + (*maps.borrow_mut())[(0) as usize].subscript_move( + __tmp_12, + |__k| cpp_move!(__k), + || ::default(), + ) }) } } @@ -521,8 +590,11 @@ fn main_0() -> i32 { && (match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_13,) => { ({ - (*maps.borrow_mut())[(1) as usize] - .subscript_move(__tmp_13, |__k| cpp_move!(__k)) + (*maps.borrow_mut())[(1) as usize].subscript_move( + __tmp_13, + |__k| cpp_move!(__k), + || ::default(), + ) }) } } diff --git a/tests/unit/out/refcount/vector_iter_range_ctor.rs b/tests/unit/out/refcount/vector_iter_range_ctor.rs index 7db23d5bdc..f03826fc7b 100644 --- a/tests/unit/out/refcount/vector_iter_range_ctor.rs +++ b/tests/unit/out/refcount/vector_iter_range_ctor.rs @@ -106,15 +106,21 @@ fn main_0() -> i32 { assert!(((v5[0_usize] as i32) == 10) && ((v5[4_usize] as i32) == 50)); let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(1)).as_pointer(),) { - (__tmp_5,) => ({ (*m.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k)) }), + (__tmp_5,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(10); match (Rc::new(RefCell::new(2)).as_pointer(),) { - (__tmp_6,) => ({ (*m.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k)) }), + (__tmp_6,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(20); match (Rc::new(RefCell::new(3)).as_pointer(),) { - (__tmp_7,) => ({ (*m.borrow_mut()).subscript_move(__tmp_7, |__k| cpp_move!(__k)) }), + (__tmp_7,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_7, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(30); let v6: Value, Value)>> = Rc::new(RefCell::new( diff --git a/tests/unit/out/unsafe/clone_vs_move.rs b/tests/unit/out/unsafe/clone_vs_move.rs index 2d515de731..0bcb14c031 100644 --- a/tests/unit/out/unsafe/clone_vs_move.rs +++ b/tests/unit/out/unsafe/clone_vs_move.rs @@ -190,7 +190,7 @@ unsafe fn main_0() -> i32 { { let mut i: i32 = 0; 'loop_: while ((i) < (N)) { - (*map1.subscript(&i)) = i; + (*map1.subscript(&i, || 0_i32)) = i; i.prefix_inc(); } } @@ -198,16 +198,16 @@ unsafe fn main_0() -> i32 { { let mut i: i32 = 0; 'loop_: while ((i) < (N)) { - assert!(((*map2.subscript(&i)) == (i))); - (*map2.subscript(&i)).prefix_inc(); + assert!(((*map2.subscript(&i, || 0_i32)) == (i))); + (*map2.subscript(&i, || 0_i32)).prefix_inc(); i.prefix_inc(); } } { let mut i: i32 = 0; 'loop_: while ((i) < (N)) { - assert!(((*map1.subscript(&i)) == (i))); - assert!(((*map2.subscript(&i)) == ((i) + (1)))); + assert!(((*map1.subscript(&i, || 0_i32)) == (i))); + assert!(((*map2.subscript(&i, || 0_i32)) == ((i) + (1)))); i.prefix_inc(); } } diff --git a/tests/unit/out/unsafe/container_element_receiver.rs b/tests/unit/out/unsafe/container_element_receiver.rs index abfc576c97..6c014cc676 100644 --- a/tests/unit/out/unsafe/container_element_receiver.rs +++ b/tests/unit/out/unsafe/container_element_receiver.rs @@ -66,10 +66,10 @@ unsafe fn main_0() -> i32 { let mut m: UnsafeMap)> = UnsafeMap::new(); { let __a1 = 8; - (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).push(__a1) + (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || Default::default())).push(__a1) }; assert!( - ((*(*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) + ((*(*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || Default::default())) .begin() .iter_deref()) == (8)) diff --git a/tests/unit/out/unsafe/find.rs b/tests/unit/out/unsafe/find.rs index 39bd8a6d4e..d6834322a7 100644 --- a/tests/unit/out/unsafe/find.rs +++ b/tests/unit/out/unsafe/find.rs @@ -55,9 +55,9 @@ unsafe fn main_0() -> i32 { }; let mut v_result_true: bool = it != v.end(); let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) = 1_f64; - (*m.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))) = 2_f64; - (*m.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k))) = 3_f64; + (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_f64)) = 1_f64; + (*m.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || 0_f64)) = 2_f64; + (*m.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k), || 0_f64)) = 3_f64; let mut m_begin: UnsafeBidirectionalIterator<(i32, f64)> = m.begin(); let mut m_end: UnsafeBidirectionalIterator<(i32, f64)> = m.end(); let mut m_result_true: bool = m_begin != m_end; diff --git a/tests/unit/out/unsafe/foreach_map.rs b/tests/unit/out/unsafe/foreach_map.rs index c37ae6b87e..7bfc6609d8 100644 --- a/tests/unit/out/unsafe/foreach_map.rs +++ b/tests/unit/out/unsafe/foreach_map.rs @@ -18,7 +18,7 @@ unsafe fn main_0() -> i32 { let mut i: i32 = 0; let mut k: i32 = 100; 'loop_: while ((i) < (100)) { - (*m.subscript(&i)) = ((k as f64) / (2_f64)); + (*m.subscript(&i, || 0_f64)) = ((k as f64) / (2_f64)); { i.prefix_inc(); k.prefix_dec() diff --git a/tests/unit/out/unsafe/map-reallocation.rs b/tests/unit/out/unsafe/map-reallocation.rs index 160bb4a00a..1bedd1c837 100644 --- a/tests/unit/out/unsafe/map-reallocation.rs +++ b/tests/unit/out/unsafe/map-reallocation.rs @@ -16,7 +16,7 @@ unsafe fn main_0() -> i32 { let N: i32 = 10000; let sentinel: i32 = ((N) / (2)); let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript(&sentinel)) = sentinel; + (*m.subscript(&sentinel, || 0_i32)) = sentinel; let mut it: UnsafeBidirectionalIterator<(i32, i32)> = m.find(&sentinel); let mut p: *mut i32 = (&mut (*it.iter_deref()).1 as *mut i32); assert!( @@ -30,14 +30,14 @@ unsafe fn main_0() -> i32 { { let mut i: i32 = 0; 'loop_: while ((i) < (sentinel)) { - (*m.subscript(&i)) = i; + (*m.subscript(&i, || 0_i32)) = i; i.prefix_inc(); } } { let mut i: i32 = ((sentinel) + (1)); 'loop_: while ((i) <= (N)) { - (*m.subscript(&i)) = i; + (*m.subscript(&i, || 0_i32)) = i; i.prefix_inc(); } } @@ -55,7 +55,7 @@ unsafe fn main_0() -> i32 { && (!(c"pointer does not have correct value after insert".as_ptr()).is_null()) ); (*it.iter_deref()).1 = 57005; - assert!(((*m.subscript(&sentinel)) == (57005))); + assert!(((*m.subscript(&sentinel, || 0_i32)) == (57005))); assert!(((*p) == (57005))); assert!(((m.len()) == ((((N) + (1)) as u32) as usize))); let mut prev: i32 = -1_i32; diff --git a/tests/unit/out/unsafe/map.rs b/tests/unit/out/unsafe/map.rs index 213f781e24..86d6fef7d1 100644 --- a/tests/unit/out/unsafe/map.rs +++ b/tests/unit/out/unsafe/map.rs @@ -41,27 +41,27 @@ pub fn main() { } unsafe fn main_0() -> i32 { let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) = 1_u32; - (*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k))) = 2_u32; - (*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k))) = 3_u32; + (*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 1_u32; + (*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 2_u32; + (*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 3_u32; assert!(((m.len()) == (3_usize))); - assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) == (1_u32))); - assert!(((*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k))) == (2_u32))); - assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k))) == (3_u32))); + assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (1_u32))); + assert!(((*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (2_u32))); + assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (3_u32))); let mut x: i32 = 4; - (*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k))) = (x as u32); + (*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = (x as u32); assert!(((m.len()) == (3_usize))); - assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) == (1_u32))); - assert!(((*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k))) == (4_u32))); - assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k))) == (3_u32))); - (unsafe { foo_0((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k)))) }); - assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) == (1_u32))); - (unsafe { bar_1(&mut (*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k)))) }); - assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k))) == (4_u32))); - (*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) = (*m - .subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) - .wrapping_add((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k)))); - assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) == (5_u32))); + assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (1_u32))); + assert!(((*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (4_u32))); + assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (3_u32))); + (unsafe { foo_0((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32))) }); + assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (1_u32))); + (unsafe { bar_1(&mut (*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32))) }); + assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (4_u32))); + (*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = + (*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) + .wrapping_add((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32))); + assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (5_u32))); let mut end: UnsafeBidirectionalIterator<(i16, u32)> = m.end(); let mut it: UnsafeBidirectionalIterator<(i16, u32)> = m.find(&1_i16); let mut const_it: UnsafeBidirectionalIterator<(i16, u32)> = @@ -91,16 +91,16 @@ unsafe fn main_0() -> i32 { (*const_it.iter_deref()).1 }; assert!(((x4) == (0_u32))); - (*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k))) = 5_u32; + (*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 5_u32; let mut it4: UnsafeBidirectionalIterator<(i16, u32)> = m.find(&4_i16); let mut p: *mut u32 = (&mut (*it4.iter_deref()).1 as *mut u32); let mut x5: u32 = (*p); - assert!(((*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k))) == (5_u32))); + assert!(((*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (5_u32))); assert!((((*it4.iter_deref()).1) == (5_u32))); assert!(((*p) == (5_u32))); assert!(((x5) == (5_u32))); (*p).prefix_inc(); - assert!(((*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k))) == (6_u32))); + assert!(((*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (6_u32))); assert!((((*it4.iter_deref()).1) == (6_u32))); assert!(((*p) == (6_u32))); assert!(((x5) == (5_u32))); @@ -113,9 +113,9 @@ unsafe fn main_0() -> i32 { (*r).erase(&(it4).clone()); assert!((((*r).len()) == (3_usize))); assert!(m.find(&4_i16) == m.end()); - (*m.subscript_move(&mut 7_i16, |__k| cpp_move_unsafe!(__k))) = 7_u32; - (*m.subscript_move(&mut 8_i16, |__k| cpp_move_unsafe!(__k))) = 8_u32; - (*m.subscript_move(&mut 9_i16, |__k| cpp_move_unsafe!(__k))) = 9_u32; + (*m.subscript_move(&mut 7_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 7_u32; + (*m.subscript_move(&mut 8_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 8_u32; + (*m.subscript_move(&mut 9_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 9_u32; assert!((((*r).len()) == (6_usize))); assert!(((m.erase_key(&10_i16)) == (0_usize))); let mut key9: i32 = 9; @@ -135,10 +135,10 @@ unsafe fn main_0() -> i32 { assert!(((other_map.len()) == (0_usize))); let mut key0: (i32, i64) = (1, (1 as i64)); let mut value: f64 = 2_f64; - (*other_map.subscript(&key0)) = value; - value = (*other_map.subscript(&key0)); + (*other_map.subscript(&key0, || 0_f64)) = value; + value = (*other_map.subscript(&key0, || 0_f64)); assert!(((other_map.len()) == (1_usize))); - assert!(((*other_map.subscript(&key0)) == (value))); + assert!(((*other_map.subscript(&key0, || 0_f64)) == (value))); assert!(((m.len()) == (3_usize))); let mut k: i32 = 0; assert!((((*m.get(&(k as i16)).expect("out of range!")).1) == (5_u32))); @@ -182,7 +182,7 @@ unsafe fn main_0() -> i32 { { let mut i: u32 = 0_u32; 'loop_: while ((i as usize) < (indexes.len())) { - (*m2.subscript(&indexes[(i as usize)])) = ((i).wrapping_rem(2_u32) != 0); + (*m2.subscript(&indexes[(i as usize)], || false)) = ((i).wrapping_rem(2_u32) != 0); i.prefix_inc(); } } @@ -205,8 +205,8 @@ unsafe fn main_0() -> i32 { (__tmp_0,) => ((*&mut (*__tmp_0).0), (*&mut (*__tmp_0).1)), }); assert!(((m3.len()) == (2_usize))); - assert!(((*m3.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) == (2))); - assert!(((*m3.subscript_move(&mut 4, |__k| cpp_move_unsafe!(__k))) == (5))); + assert!(((*m3.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) == (2))); + assert!(((*m3.subscript_move(&mut 4, |__k| cpp_move_unsafe!(__k), || 0_i32)) == (5))); let mut hinted: UnsafeBidirectionalIterator<(i32, i32)> = { let _ = >::from(m3.end()); m3.emplace((6, 7)).0 @@ -219,17 +219,29 @@ unsafe fn main_0() -> i32 { let mut key8: i32 = 8; let mut tried_new: (UnsafeBidirectionalIterator<(i32, i32)>, bool) = m3.try_emplace(key8, || 9); assert!((tried_new.1 as bool)); - assert!(((*m3.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k))) == (9))); + assert!(((*m3.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k), || 0_i32)) == (9))); assert!(((m3.len()) == (4_usize))); let mut points: UnsafeMap = UnsafeMap::new(); let mut point_new: (UnsafeBidirectionalIterator<(i32, Point)>, bool) = points.try_emplace(key1, || Point::new_2({ 3 }, { 4 })); assert!((point_new.1 as bool)); - assert!((((*points.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).x) == (3))); - assert!((((*points.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).y) == (4))); + assert!( + (((*points.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || ::default())).x) + == (3)) + ); + assert!( + (((*points.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || ::default())).y) + == (4)) + ); points.emplace((key8, Point::new_2({ 5 }, { 6 }))); - assert!((((*points.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k))).x) == (5))); - assert!((((*points.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k))).y) == (6))); + assert!( + (((*points.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k), || ::default())).x) + == (5)) + ); + assert!( + (((*points.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k), || ::default())).y) + == (6)) + ); assert!(((points.len()) == (2_usize))); let mut mi: UnsafeBidirectionalIterator<(i32, i32)> = m3.begin(); let mr: *mut UnsafeBidirectionalIterator<(i32, i32)> = &mut (*{ @@ -262,18 +274,25 @@ unsafe fn main_0() -> i32 { let mut pk2: i32 = 0; let mut ptr_counts: UnsafeMap<*mut i32, (*mut i32, i32)> = UnsafeMap::new(); let mut ptr_key: *mut i32 = (&mut pk1 as *mut i32); - (*ptr_counts.subscript(&ptr_key)) = 1; + (*ptr_counts.subscript(&ptr_key, || 0_i32)) = 1; ptr_key = (&mut pk2 as *mut i32); - (*ptr_counts.subscript(&ptr_key)) = 2; - (*ptr_counts.subscript(&ptr_key)) += 3; + (*ptr_counts.subscript(&ptr_key, || 0_i32)) = 2; + (*ptr_counts.subscript(&ptr_key, || 0_i32)) += 3; assert!(((ptr_counts.len()) == (2_usize))); - assert!(((*ptr_counts.subscript(&ptr_key)) == (5))); + assert!(((*ptr_counts.subscript(&ptr_key, || 0_i32)) == (5))); ptr_key = (&mut pk1 as *mut i32); - assert!(((*ptr_counts.subscript(&ptr_key)) == (1))); - (*ptr_counts.subscript_move(&mut (&mut pk2 as *mut i32), |__k| cpp_move_unsafe!(__k))) += 1; + assert!(((*ptr_counts.subscript(&ptr_key, || 0_i32)) == (1))); + (*ptr_counts.subscript_move( + &mut (&mut pk2 as *mut i32), + |__k| cpp_move_unsafe!(__k), + || 0_i32, + )) += 1; assert!( - ((*ptr_counts.subscript_move(&mut (&mut pk2 as *mut i32), |__k| cpp_move_unsafe!(__k))) - == (6)) + ((*ptr_counts.subscript_move( + &mut (&mut pk2 as *mut i32), + |__k| cpp_move_unsafe!(__k), + || 0_i32 + )) == (6)) ); assert!(((pk1) == (0)) && ((pk2) == (0))); return 0; diff --git a/tests/unit/out/unsafe/map_copy.rs b/tests/unit/out/unsafe/map_copy.rs index a02679ec01..f866982b55 100644 --- a/tests/unit/out/unsafe/map_copy.rs +++ b/tests/unit/out/unsafe/map_copy.rs @@ -14,15 +14,15 @@ pub fn main() { } unsafe fn main_0() -> i32 { let mut a: UnsafeMap = UnsafeMap::new(); - (*a.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) = 10; + (*a.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 10; let mut b: UnsafeMap = a.clone(); - (*b.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) = 20; - assert!(((*a.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) == (10))); + (*b.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 20; + assert!(((*a.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) == (10))); let mut x: UnsafeMap = UnsafeMap::new(); - (*x.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))) = 3; + (*x.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 3; let mut y: UnsafeMap = x.clone(); - (*y.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))) = 4; - assert!(((*x.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))) == (3))); + (*y.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 4; + assert!(((*x.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || 0_i32)) == (3))); return 0; } pub unsafe fn __cpp2rust_init_globals() {} diff --git a/tests/unit/out/unsafe/map_key_copy_ctor.rs b/tests/unit/out/unsafe/map_key_copy_ctor.rs index 1a27e480ba..2aa3777fcd 100644 --- a/tests/unit/out/unsafe/map_key_copy_ctor.rs +++ b/tests/unit/out/unsafe/map_key_copy_ctor.rs @@ -82,15 +82,15 @@ unsafe fn main_0() -> i32 { let mut a: Key = Key::new({ 1 }); let mut b: Key = Key::new({ 2 }); let mut c: Key = Key::new({ 3 }); - (*m.subscript(&a)) = 10; + (*m.subscript(&a, || 0_i32)) = 10; ok = ((ok as i32) & (((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (1)) as i32)) != 0; - (*m.subscript(&b)) = 20; + (*m.subscript(&b, || 0_i32)) = 20; ok = ((ok as i32) & (((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (2)) as i32)) != 0; - (*m.subscript(&a)) = 11; + (*m.subscript(&a, || 0_i32)) = 11; ok = ((ok as i32) & (((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (2)) as i32)) != 0; @@ -99,29 +99,37 @@ unsafe fn main_0() -> i32 { ok = ((ok as i32) & (((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (2)) as i32)) != 0; - (*m.subscript_move(&mut (unsafe { make_key_3(4) }), |__k| cpp_move_unsafe!(__k))) = 40; - (*m.subscript_move(&mut (unsafe { make_key_3(4) }), |__k| cpp_move_unsafe!(__k))) = 41; + (*m.subscript_move( + &mut (unsafe { make_key_3(4) }), + |__k| cpp_move_unsafe!(__k), + || 0_i32, + )) = 40; + (*m.subscript_move( + &mut (unsafe { make_key_3(4) }), + |__k| cpp_move_unsafe!(__k), + || 0_i32, + )) = 41; ok = ((ok as i32) & (((((*std::cell::LazyCell::force_mut(&mut *&raw mut made_2)) == (2)) && ((*std::cell::LazyCell::force_mut(&mut *&raw mut moves_1)) == (1))) && ((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (2))) as i32)) != 0; - (*m.subscript_move(&mut c, |__k| cpp_move_unsafe!(__k))) = 30; - (*m.subscript_move(&mut c, |__k| cpp_move_unsafe!(__k))) = 31; + (*m.subscript_move(&mut c, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 30; + (*m.subscript_move(&mut c, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 31; ok = ((ok as i32) & (((((*std::cell::LazyCell::force_mut(&mut *&raw mut moves_1)) == (2)) && ((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (2))) && ((c.k) == (3))) as i32)) != 0; ok = ((ok as i32) & (((m.len()) == (4_usize)) as i32)) != 0; - (*m.subscript(&(*m.begin().iter_deref()).0)) += 1; + (*m.subscript(&(*m.begin().iter_deref()).0, || 0_i32)) += 1; ok = ((ok as i32) & ((((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (2)) - && ((*m.subscript(&a)) == (12))) as i32)) + && ((*m.subscript(&a, || 0_i32)) == (12))) as i32)) != 0; let mut first: *const Key = (&(*m.begin().iter_deref()).0 as *const Key); - (*m.subscript_move(&mut Key::new({ 0 }), |__k| cpp_move_unsafe!(__k))) = 0; + (*m.subscript_move(&mut Key::new({ 0 }), |__k| cpp_move_unsafe!(__k), || 0_i32)) = 0; ok = ((ok as i32) & (((*std::cell::LazyCell::force_mut(&mut *&raw mut moves_1)) == (3)) as i32)) != 0; @@ -130,7 +138,9 @@ unsafe fn main_0() -> i32 { ok = ((ok as i32) & (((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == ((2) + (5))) as i32)) != 0; - ok = ((ok as i32) & ((((n.len()) == (5_usize)) && ((*n.subscript(&a)) == (12))) as i32)) != 0; + ok = ((ok as i32) + & ((((n.len()) == (5_usize)) && ((*n.subscript(&a, || 0_i32)) == (12))) as i32)) + != 0; m.erase(&m.find(&a)); ok = ((ok as i32) & (((m.erase_key(&b)) == (1_usize)) as i32)) != 0; ok = ((ok as i32) & (((m.erase_key(&b)) == (0_usize)) as i32)) != 0; diff --git a/tests/unit/out/unsafe/map_key_identity.rs b/tests/unit/out/unsafe/map_key_identity.rs index a3c8420acc..3db4f6cd3e 100644 --- a/tests/unit/out/unsafe/map_key_identity.rs +++ b/tests/unit/out/unsafe/map_key_identity.rs @@ -84,7 +84,7 @@ unsafe fn main_0() -> i32 { }) as i32)) != 0; let mut distinct: UnsafeMap = UnsafeMap::new(); - let a: *mut Mapped = &mut (*distinct.subscript(&distinct_a)); + let a: *mut Mapped = &mut (*distinct.subscript(&distinct_a, || ::default())); (*a).value = 11; let mut a_it: UnsafeBidirectionalIterator<(Key, Mapped)> = distinct.find(&distinct_a); let mut a_value: *mut Mapped = (&mut (*a_it.iter_deref()).1 as *mut Mapped); @@ -92,7 +92,7 @@ unsafe fn main_0() -> i32 { & (((*std::cell::LazyCell::force_mut(&mut *&raw mut default_constructions_0)) == (1)) as i32)) != 0; - let b: *mut Mapped = &mut (*distinct.subscript(&distinct_b)); + let b: *mut Mapped = &mut (*distinct.subscript(&distinct_b, || ::default())); (*b).value = 22; let mut b_it: UnsafeBidirectionalIterator<(Key, Mapped)> = distinct.find(&distinct_b); ok = ((ok as i32) @@ -145,7 +145,7 @@ unsafe fn main_0() -> i32 { let mut equivalent: UnsafeMap = UnsafeMap::new(); let before_equivalent: i32 = (*std::cell::LazyCell::force_mut(&mut *&raw mut default_constructions_0)); - let first: *mut Mapped = &mut (*equivalent.subscript(&equivalent_a)); + let first: *mut Mapped = &mut (*equivalent.subscript(&equivalent_a, || ::default())); (*first).value = 31; let mut first_it: UnsafeBidirectionalIterator<(Key, Mapped)> = equivalent.find(&equivalent_a); let mut first_value: *mut Mapped = (&mut (*first_it.iter_deref()).1 as *mut Mapped); @@ -153,7 +153,7 @@ unsafe fn main_0() -> i32 { & (((*std::cell::LazyCell::force_mut(&mut *&raw mut default_constructions_0)) == ((before_equivalent) + (1))) as i32)) != 0; - let second: *mut Mapped = &mut (*equivalent.subscript(&equivalent_b)); + let second: *mut Mapped = &mut (*equivalent.subscript(&equivalent_b, || ::default())); let reused: bool = ((*std::cell::LazyCell::force_mut(&mut *&raw mut default_constructions_0)) == ((before_equivalent) + (1))); ok = ((ok as i32) & (reused as i32)) != 0; @@ -190,7 +190,7 @@ unsafe fn main_0() -> i32 { order: 4, identity: 10, }; - let later: *mut Mapped = &mut (*equivalent.subscript(&later_key)); + let later: *mut Mapped = &mut (*equivalent.subscript(&later_key, || ::default())); (*later).value = 41; ok = ((ok as i32) & (((*std::cell::LazyCell::force_mut(&mut *&raw mut default_constructions_0)) @@ -219,7 +219,7 @@ unsafe fn main_0() -> i32 { let before_matching: i32 = (*std::cell::LazyCell::force_mut(&mut *&raw mut default_constructions_0)); let mut matching: UnsafeMap = UnsafeMap::new(); - let matched: *mut Mapped = &mut (*matching.subscript(&matching_a)); + let matched: *mut Mapped = &mut (*matching.subscript(&matching_a, || ::default())); (*matched).value = 51; let mut matched_it: UnsafeBidirectionalIterator<(Key, Mapped)> = matching.find(&matching_a); let mut matched_value: *mut Mapped = (&mut (*matched_it.iter_deref()).1 as *mut Mapped); @@ -227,7 +227,8 @@ unsafe fn main_0() -> i32 { & (((*std::cell::LazyCell::force_mut(&mut *&raw mut default_constructions_0)) == ((before_matching) + (1))) as i32)) != 0; - let matched_again: *mut Mapped = &mut (*matching.subscript(&matching_b)); + let matched_again: *mut Mapped = + &mut (*matching.subscript(&matching_b, || ::default())); ok = ((ok as i32) & (((*std::cell::LazyCell::force_mut(&mut *&raw mut default_constructions_0)) == ((before_matching) + (1))) as i32)) @@ -239,7 +240,7 @@ unsafe fn main_0() -> i32 { & (((&mut (*matched_it.iter_deref()).1 as *mut Mapped) == (matched_value)) as i32)) != 0; ok = ((ok as i32) & ((((*matched_it.iter_deref()).1.value) == (51)) as i32)) != 0; - let other: *mut Mapped = &mut (*matching.subscript(&matching_c)); + let other: *mut Mapped = &mut (*matching.subscript(&matching_c, || ::default())); (*other).value = 61; ok = ((ok as i32) & (((*std::cell::LazyCell::force_mut(&mut *&raw mut default_constructions_0)) diff --git a/tests/unit/out/unsafe/map_try_emplace.rs b/tests/unit/out/unsafe/map_try_emplace.rs index 2dcc86c9c4..fa7e6983ff 100644 --- a/tests/unit/out/unsafe/map_try_emplace.rs +++ b/tests/unit/out/unsafe/map_try_emplace.rs @@ -93,8 +93,10 @@ pub static mut global_counter_8: std::cell::LazyCell = std::cell::LazyCell::new(|| unsafe { 0 }); pub static mut seed_9: std::cell::LazyCell = std::cell::LazyCell::new(|| unsafe { { - (*(*std::cell::LazyCell::force_mut(&mut *&raw mut global_map_6)) - .subscript(&(*std::cell::LazyCell::force_mut(&mut *&raw mut global_key_7)))) = 10; + (*(*std::cell::LazyCell::force_mut(&mut *&raw mut global_map_6)).subscript( + &(*std::cell::LazyCell::force_mut(&mut *&raw mut global_key_7)), + || 0_i32, + )) = 10; 0 } }); @@ -146,7 +148,7 @@ unsafe fn main_0() -> i32 { let mut k: i32 = 0; 'loop_: while ((k) < (3)) { if (((subset) & ((1) << (k))) != 0) { - (*m.subscript(&k)) = ((10) + (k)); + (*m.subscript(&k, || 0_i32)) = ((10) + (k)); size.prefix_inc(); } k.prefix_inc(); diff --git a/tests/unit/out/unsafe/map_try_emplace_lvalues.rs b/tests/unit/out/unsafe/map_try_emplace_lvalues.rs index c428da3800..ee05ad76ea 100644 --- a/tests/unit/out/unsafe/map_try_emplace_lvalues.rs +++ b/tests/unit/out/unsafe/map_try_emplace_lvalues.rs @@ -453,7 +453,7 @@ unsafe fn main_0() -> i32 { && (((*narrowed.0.iter_deref()).1) == (1_u32)) ); let mut changed: UnsafeMap = UnsafeMap::new(); - (*changed.subscript(&key)) = 10; + (*changed.subscript(&key, || 0_i32)) = 10; let mut effects: i32 = 0; let mut erased: (UnsafeBidirectionalIterator<(i32, i32)>, bool) = match (({ changed.erase_key(&key); @@ -468,7 +468,7 @@ unsafe fn main_0() -> i32 { }; assert!((((effects) == (1)) && (erased.1)) && (((*erased.0.iter_deref()).1) == (1))); let mut updated: (UnsafeBidirectionalIterator<(i32, i32)>, bool) = match (({ - (*changed.subscript(&key)).prefix_inc(); + (*changed.subscript(&key, || 0_i32)).prefix_inc(); { let __tmp_42 = &mut effects; (*__tmp_42).prefix_inc(); @@ -505,7 +505,7 @@ unsafe fn main_0() -> i32 { IterRange::new(keys.as_ptr(), keys.as_ptr().offset((6_i64) as isize)) { let mut k: i32 = (*k); - (*values.subscript(&k)) = 42; + (*values.subscript(&k, || 0_i32)) = 42; } } let mut moved: i32 = 0; @@ -587,7 +587,7 @@ unsafe fn main_0() -> i32 { 'loop_: for k in IterRange::new(keys.as_ptr(), keys.as_ptr().offset((6_i64) as isize)) { let mut k: i32 = (*k); assert!( - ((*values.subscript(&k)) + ((*values.subscript(&k, || 0_i32)) == (if (hit != 0) { 42 } else { @@ -611,7 +611,7 @@ unsafe fn main_0() -> i32 { IterRange::new(keys.as_ptr(), keys.as_ptr().offset((3_i64) as isize)) { let mut k: i32 = (*k); - (*selected.subscript(&k)).value = 42; + (*selected.subscript(&k, || ::default())).value = 42; } } let mut a: i32 = 0; @@ -753,7 +753,7 @@ unsafe fn main_0() -> i32 { IterRange::new(keys.as_ptr(), keys.as_ptr().offset((3_i64) as isize)) { let mut k: i32 = (*k); - (*values.subscript(&k)) = 42; + (*values.subscript(&k, || 0_i32)) = 42; } } let mut before: i32 = @@ -843,7 +843,7 @@ unsafe fn main_0() -> i32 { references.try_emplace(key, || Held::new_1({ __tmp_79 })) } }; - value = (*(*references.subscript(&key)).ptr) + value = (*(*references.subscript(&key, || ::default())).ptr) } }; assert!( @@ -888,7 +888,9 @@ unsafe fn main_0() -> i32 { arrays.try_emplace(key, || Held::new_3({ __tmp_82 }, { 0 })) } }; - value = (*(*arrays.subscript(&key)).ptr.offset((1) as isize)) + value = (*(*arrays.subscript(&key, || ::default())) + .ptr + .offset((1) as isize)) } }; assert!( @@ -912,7 +914,7 @@ unsafe fn main_0() -> i32 { IterRange::new(keys.as_ptr(), keys.as_ptr().offset((6_i64) as isize)) { let mut k: i32 = (*k); - (*values.subscript(&k)) = 42; + (*values.subscript(&k, || 0_i32)) = 42; } } let mut before: i32 = @@ -1027,7 +1029,7 @@ unsafe fn main_0() -> i32 { 'loop_: for k in IterRange::new(keys.as_ptr(), keys.as_ptr().offset((6_i64) as isize)) { let mut k: i32 = (*k); assert!( - ((*values.subscript(&k)) + ((*values.subscript(&k, || 0_i32)) == (if (hit != 0) { 42 } else { @@ -1077,7 +1079,7 @@ unsafe fn main_0() -> i32 { references.try_emplace(key, || Held::new_1({ __tmp_97 })) } }; - value = (*(*references.subscript(&key)).ptr) + value = (*(*references.subscript(&key, || ::default())).ptr) } }; assert!( @@ -1110,7 +1112,7 @@ unsafe fn main_0() -> i32 { owners.try_emplace(key, || Held::new_1({ __tmp_100 })) } }; - value = (*(*owners.subscript(&key)).ptr) + value = (*(*owners.subscript(&key, || ::default())).ptr) } }; assert!(((value) == (5))); diff --git a/tests/unit/out/unsafe/operator_traits.rs b/tests/unit/out/unsafe/operator_traits.rs index d0b99ac101..2220f24f40 100644 --- a/tests/unit/out/unsafe/operator_traits.rs +++ b/tests/unit/out/unsafe/operator_traits.rs @@ -251,10 +251,12 @@ unsafe fn main_0() -> i32 { .v) == (2)) ); let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move((&mut Lt { v: 2 }), |__k| cpp_move_unsafe!(__k))) = 20; - (*m.subscript_move((&mut Lt { v: 1 }), |__k| cpp_move_unsafe!(__k))) = 10; + (*m.subscript_move((&mut Lt { v: 2 }), |__k| cpp_move_unsafe!(__k), || 0_i32)) = 20; + (*m.subscript_move((&mut Lt { v: 1 }), |__k| cpp_move_unsafe!(__k), || 0_i32)) = 10; assert!((((*m.begin().iter_deref()).1) == (10))); - assert!(((*m.subscript_move((&mut Lt { v: 2 }), |__k| cpp_move_unsafe!(__k))) == (20))); + assert!( + ((*m.subscript_move((&mut Lt { v: 2 }), |__k| cpp_move_unsafe!(__k), || 0_i32)) == (20)) + ); return 0; } pub unsafe fn __cpp2rust_init_globals() {} diff --git a/tests/unit/out/unsafe/redundant_copy_in_conversion.rs b/tests/unit/out/unsafe/redundant_copy_in_conversion.rs index 79a657af7e..0955765f37 100644 --- a/tests/unit/out/unsafe/redundant_copy_in_conversion.rs +++ b/tests/unit/out/unsafe/redundant_copy_in_conversion.rs @@ -23,7 +23,7 @@ pub fn main() { } unsafe fn main_0() -> i32 { let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move(&mut 0, |__k| cpp_move_unsafe!(__k))) = 1; + (*m.subscript_move(&mut 0, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 1; let mut end: UnsafeBidirectionalIterator<(i32, i32)> = m.end(); let mut it0: UnsafeBidirectionalIterator<(i32, i32)> = m.find(&0); let mut const_it: UnsafeBidirectionalIterator<(i32, i32)> = diff --git a/tests/unit/out/unsafe/sort_no_copy.rs b/tests/unit/out/unsafe/sort_no_copy.rs index 4932e469d3..3bbecb7137 100644 --- a/tests/unit/out/unsafe/sort_no_copy.rs +++ b/tests/unit/out/unsafe/sort_no_copy.rs @@ -481,8 +481,16 @@ unsafe fn main_0() -> i32 { ); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); let mut bag_map: UnsafeMap = UnsafeMap::new(); - (*bag_map.subscript_move(&mut bag_vec[(2_usize)], |__k| cpp_move_unsafe!(__k))) = 2; - (*bag_map.subscript_move(&mut bag_vec[(0_usize)], |__k| cpp_move_unsafe!(__k))) = 0; + (*bag_map.subscript_move( + &mut bag_vec[(2_usize)], + |__k| cpp_move_unsafe!(__k), + || 0_i32, + )) = 2; + (*bag_map.subscript_move( + &mut bag_vec[(0_usize)], + |__k| cpp_move_unsafe!(__k), + || 0_i32, + )) = 0; assert!((((*bag_map.find(&bags[(2) as usize]).iter_deref()).1) == (2))); assert!(bag_map.find(&bags[(1) as usize]) == bag_map.end()); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); diff --git a/tests/unit/out/unsafe/swap_map_no_copy.rs b/tests/unit/out/unsafe/swap_map_no_copy.rs index 2708d92ffa..531158fe71 100644 --- a/tests/unit/out/unsafe/swap_map_no_copy.rs +++ b/tests/unit/out/unsafe/swap_map_no_copy.rs @@ -364,14 +364,14 @@ unsafe fn main_0() -> i32 { (unsafe { let mut _o: Tracked = Tracked::new_1({ 10 }); Tracked::move_assign( - &mut (*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))), + &mut (*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || ::default())), &mut _o, ) }); (unsafe { let mut _o: Tracked = Tracked::new_1({ 20 }); Tracked::move_assign( - &mut (*m1.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))), + &mut (*m1.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || ::default())), &mut _o, ) }); @@ -379,29 +379,50 @@ unsafe fn main_0() -> i32 { (unsafe { let mut _o: Tracked = Tracked::new_1({ 30 }); Tracked::move_assign( - &mut (*m2.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k))), + &mut (*m2.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k), || ::default())), &mut _o, ) }); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); cpp_swap_unsafe!( - &mut (*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))), - &mut (*m1.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))) + &mut (*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || ::default())), + &mut (*m1.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || ::default())) ); assert!( - (((*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).v) == (20)) - && (((*m1.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))).v) == (10)) + (((*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || ::default())).v) + == (20)) + && (((*m1.subscript_move( + &mut 2, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (10)) ); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); cpp_swap_unsafe!(&mut m1, &mut m2); assert!( ((m1.len()) == (1_usize)) - && (((*m1.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k))).v) == (30)) + && (((*m1.subscript_move( + &mut 3, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (30)) ); assert!( (((m2.len()) == (2_usize)) - && (((*m2.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).v) == (20))) - && (((*m2.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))).v) == (10)) + && (((*m2.subscript_move( + &mut 1, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (20))) + && (((*m2.subscript_move( + &mut 2, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (10)) ); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); let mut arr: [Tracked; 3] = [ @@ -486,27 +507,43 @@ unsafe fn main_0() -> i32 { (unsafe { let mut _o: Tracked = Tracked::new_1({ 1 }); Tracked::move_assign( - &mut (*maps[(0) as usize].subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))), + &mut (*maps[(0) as usize].subscript_move( + &mut 1, + |__k| cpp_move_unsafe!(__k), + || ::default(), + )), &mut _o, ) }); (unsafe { let mut _o: Tracked = Tracked::new_1({ 2 }); Tracked::move_assign( - &mut (*maps[(1) as usize].subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))), + &mut (*maps[(1) as usize].subscript_move( + &mut 2, + |__k| cpp_move_unsafe!(__k), + || ::default(), + )), &mut _o, ) }); cpp_swap_unsafe!(&mut maps[(0) as usize], &mut maps[(1) as usize]); assert!( ((maps[(0) as usize].len()) == (1_usize)) - && (((*maps[(0) as usize].subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))).v) - == (2)) + && (((*maps[(0) as usize].subscript_move( + &mut 2, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (2)) ); assert!( ((maps[(1) as usize].len()) == (1_usize)) - && (((*maps[(1) as usize].subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).v) - == (1)) + && (((*maps[(1) as usize].subscript_move( + &mut 1, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (1)) ); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); let mut c1: CopyOnly = CopyOnly::new({ 1 }); diff --git a/tests/unit/out/unsafe/vector_iter_range_ctor.rs b/tests/unit/out/unsafe/vector_iter_range_ctor.rs index ab8f8464b3..c6d82cdaf3 100644 --- a/tests/unit/out/unsafe/vector_iter_range_ctor.rs +++ b/tests/unit/out/unsafe/vector_iter_range_ctor.rs @@ -122,9 +122,9 @@ unsafe fn main_0() -> i32 { assert!(((v5.len()) == (5_usize))); assert!(((v5[(0_usize)] as i32) == (10)) && ((v5[(4_usize)] as i32) == (50))); let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) = 10; - (*m.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))) = 20; - (*m.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k))) = 30; + (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 10; + (*m.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 20; + (*m.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 30; let mut v6: Vec<(i32, i32)> = match ({ m.begin() }, { m.end() }) { (mut __tmp_6, mut __tmp_7) => { let mut __v = Vec::new(); From 5338f05dd7e25416c5e1141cc5c5974be0c73351 Mon Sep 17 00:00:00 2001 From: Lucian Popescu Date: Fri, 20 Nov 2026 14:17:52 +0000 Subject: [PATCH 4/4] Update tests --- tests/unit/out/refcount/clone_vs_move.rs | 12 +- tests/unit/out/refcount/find.rs | 12 +- tests/unit/out/refcount/map.rs | 148 +++++++++++++----- tests/unit/out/refcount/operator_traits.rs | 10 +- tests/unit/out/refcount/sort_no_copy.rs | 8 +- tests/unit/out/refcount/swap_map_no_copy.rs | 108 ++++++++++--- .../out/refcount/vector_iter_range_ctor.rs | 12 +- tests/unit/out/unsafe/clone_vs_move.rs | 10 +- tests/unit/out/unsafe/find.rs | 6 +- tests/unit/out/unsafe/foreach_map.rs | 2 +- tests/unit/out/unsafe/map.rs | 105 ++++++++----- tests/unit/out/unsafe/map_try_emplace.rs | 8 +- .../out/unsafe/map_try_emplace_lvalues.rs | 26 +-- tests/unit/out/unsafe/operator_traits.rs | 8 +- tests/unit/out/unsafe/sort_no_copy.rs | 12 +- tests/unit/out/unsafe/swap_map_no_copy.rs | 69 ++++++-- .../unit/out/unsafe/vector_iter_range_ctor.rs | 6 +- 17 files changed, 395 insertions(+), 167 deletions(-) diff --git a/tests/unit/out/refcount/clone_vs_move.rs b/tests/unit/out/refcount/clone_vs_move.rs index 370caf96c4..c47e6b29a3 100644 --- a/tests/unit/out/refcount/clone_vs_move.rs +++ b/tests/unit/out/refcount/clone_vs_move.rs @@ -223,7 +223,7 @@ fn main_0() -> i32 { let i: Value = Rc::new(RefCell::new(0)); 'loop_: while ((*i.borrow()) < N) { let __rhs = (*i.borrow()); - ({ (*map1.borrow_mut()).subscript(i.as_pointer()) }).write(__rhs); + ({ (*map1.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).write(__rhs); (*i.borrow_mut()).prefix_inc(); } } @@ -234,10 +234,11 @@ fn main_0() -> i32 { 'loop_: while ((*i.borrow()) < N) { assert!( ({ - ((({ (*map2.borrow_mut()).subscript(i.as_pointer()) }).read()) == (*i.borrow())) + ((({ (*map2.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).read()) + == (*i.borrow())) }) ); - ({ (*map2.borrow_mut()).subscript(i.as_pointer()) }).with_mut(|__v| { + ({ (*map2.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).with_mut(|__v| { __v.prefix_inc(); }); (*i.borrow_mut()).prefix_inc(); @@ -248,12 +249,13 @@ fn main_0() -> i32 { 'loop_: while ((*i.borrow()) < N) { assert!( ({ - ((({ (*map1.borrow_mut()).subscript(i.as_pointer()) }).read()) == (*i.borrow())) + ((({ (*map1.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).read()) + == (*i.borrow())) }) ); assert!( ({ - ((({ (*map2.borrow_mut()).subscript(i.as_pointer()) }).read()) + ((({ (*map2.borrow_mut()).subscript(i.as_pointer(), || 0_i32) }).read()) == ((*i.borrow()) + 1)) }) ); diff --git a/tests/unit/out/refcount/find.rs b/tests/unit/out/refcount/find.rs index ac47e65666..abe4b00636 100644 --- a/tests/unit/out/refcount/find.rs +++ b/tests/unit/out/refcount/find.rs @@ -53,15 +53,21 @@ fn main_0() -> i32 { let mut v_result_true: bool = (*it.borrow()) != v.decay().end(); let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(1)).as_pointer(),) { - (__tmp_2,) => ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k)) }), + (__tmp_2,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k), || 0_f64) }) + } } .write(1_f64); match (Rc::new(RefCell::new(2)).as_pointer(),) { - (__tmp_3,) => ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k)) }), + (__tmp_3,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k), || 0_f64) }) + } } .write(2_f64); match (Rc::new(RefCell::new(3)).as_pointer(),) { - (__tmp_4,) => ({ (*m.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k)) }), + (__tmp_4,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k), || 0_f64) }) + } } .write(3_f64); let m_begin: Value, Value)>> = Rc::new(RefCell::new( diff --git a/tests/unit/out/refcount/map.rs b/tests/unit/out/refcount/map.rs index 9424031cd0..6f0f0142ef 100644 --- a/tests/unit/out/refcount/map.rs +++ b/tests/unit/out/refcount/map.rs @@ -40,22 +40,28 @@ pub fn main() { fn main_0() -> i32 { let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { - (__tmp_0,) => ({ (*m.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k)) }), + (__tmp_0,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(1_u32); match (Rc::new(RefCell::new(1_i16)).as_pointer(),) { - (__tmp_1,) => ({ (*m.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k)) }), + (__tmp_1,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(2_u32); match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { - (__tmp_2,) => ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k)) }), + (__tmp_2,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(3_u32); assert!(({ ((*m.borrow()).len() == 3_usize) })); assert!( ((match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { (__tmp_3,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -64,7 +70,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(1_i16)).as_pointer(),) { (__tmp_4,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -73,7 +79,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { (__tmp_5,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -81,14 +87,16 @@ fn main_0() -> i32 { ); let mut x: i32 = 4; match (Rc::new(RefCell::new(1_i16)).as_pointer(),) { - (__tmp_6,) => ({ (*m.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k)) }), + (__tmp_6,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k), || 0_u32) }) + } } .write((x as u32)); assert!(({ ((*m.borrow()).len() == 3_usize) })); assert!( ((match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { (__tmp_7,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_7, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_7, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -97,7 +105,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(1_i16)).as_pointer(),) { (__tmp_8,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_8, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_8, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -106,7 +114,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { (__tmp_9,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_9, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_9, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -116,7 +124,7 @@ fn main_0() -> i32 { foo_0( (match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { (__tmp_10,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_10, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_10, |__k| cpp_move!(__k), || 0_u32) }) } } .read()), @@ -125,7 +133,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { (__tmp_11,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_11, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_11, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -133,36 +141,44 @@ fn main_0() -> i32 { ); ({ bar_1(match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { - (__tmp_12,) => ({ (*m.borrow_mut()).subscript_move(__tmp_12, |__k| cpp_move!(__k)) }), + (__tmp_12,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_12, |__k| cpp_move!(__k), || 0_u32) }) + } }) }); assert!( ((match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { (__tmp_13,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_13, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_13, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) == 4_u32) ); let __rhs = (match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { - (__tmp_14,) => ({ (*m.borrow_mut()).subscript_move(__tmp_14, |__k| cpp_move!(__k)) }), + (__tmp_14,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_14, |__k| cpp_move!(__k), || 0_u32) }) + } } .read()) .wrapping_add( (match (Rc::new(RefCell::new(2_i16)).as_pointer(),) { - (__tmp_15,) => ({ (*m.borrow_mut()).subscript_move(__tmp_15, |__k| cpp_move!(__k)) }), + (__tmp_15,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_15, |__k| cpp_move!(__k), || 0_u32) }) + } } .read()), ); match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { - (__tmp_16,) => ({ (*m.borrow_mut()).subscript_move(__tmp_16, |__k| cpp_move!(__k)) }), + (__tmp_16,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_16, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(__rhs); assert!( ((match (Rc::new(RefCell::new(0_i16)).as_pointer(),) { (__tmp_17,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_17, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_17, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -232,7 +248,9 @@ fn main_0() -> i32 { }; assert!((x4 == 0_u32)); match (Rc::new(RefCell::new(4_i16)).as_pointer(),) { - (__tmp_20,) => ({ (*m.borrow_mut()).subscript_move(__tmp_20, |__k| cpp_move!(__k)) }), + (__tmp_20,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_20, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(5_u32); let it4: Value, Value)>> = Rc::new(RefCell::new( @@ -249,7 +267,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(4_i16)).as_pointer(),) { (__tmp_22,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_22, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_22, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -271,7 +289,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(4_i16)).as_pointer(),) { (__tmp_23,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_23, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_23, |__k| cpp_move!(__k), || 0_u32) }) } } .read()) @@ -329,15 +347,21 @@ fn main_0() -> i32 { .with(|__m: &Map, Value)>| __m.end()) ); match (Rc::new(RefCell::new(7_i16)).as_pointer(),) { - (__tmp_27,) => ({ (*m.borrow_mut()).subscript_move(__tmp_27, |__k| cpp_move!(__k)) }), + (__tmp_27,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_27, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(7_u32); match (Rc::new(RefCell::new(8_i16)).as_pointer(),) { - (__tmp_28,) => ({ (*m.borrow_mut()).subscript_move(__tmp_28, |__k| cpp_move!(__k)) }), + (__tmp_28,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_28, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(8_u32); match (Rc::new(RefCell::new(9_i16)).as_pointer(),) { - (__tmp_29,) => ({ (*m.borrow_mut()).subscript_move(__tmp_29, |__k| cpp_move!(__k)) }), + (__tmp_29,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_29, |__k| cpp_move!(__k), || 0_u32) }) + } } .write(9_u32); assert!(({ ((*r.upgrade().deref()).len() == 6_usize) })); @@ -407,18 +431,18 @@ fn main_0() -> i32 { ))); let mut value: f64 = 2_f64; match (key0.as_pointer(),) { - (__tmp_35,) => ({ (*other_map.borrow_mut()).subscript(__tmp_35) }), + (__tmp_35,) => ({ (*other_map.borrow_mut()).subscript(__tmp_35, || 0_f64) }), } .write(value); value = (match (key0.as_pointer(),) { - (__tmp_36,) => ({ (*other_map.borrow_mut()).subscript(__tmp_36) }), + (__tmp_36,) => ({ (*other_map.borrow_mut()).subscript(__tmp_36, || 0_f64) }), } .read()); assert!(({ ((*other_map.borrow()).len() == 1_usize) })); assert!( ((match (key0.as_pointer(),) { (__tmp_37,) => { - ({ (*other_map.borrow_mut()).subscript(__tmp_37) }) + ({ (*other_map.borrow_mut()).subscript(__tmp_37, || 0_f64) }) } } .read()) @@ -502,7 +526,7 @@ fn main_0() -> i32 { 'loop_: while ((i as usize) < (*indexes.borrow()).len()) { let __rhs = ((i).wrapping_rem(2_u32) != 0); match (indexes.decay().offset((i as usize)),) { - (__tmp_41,) => ({ (*m2.borrow_mut()).subscript(__tmp_41) }), + (__tmp_41,) => ({ (*m2.borrow_mut()).subscript(__tmp_41, || false) }), } .write(__rhs); i.prefix_inc(); @@ -603,7 +627,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_46,) => { - ({ (*m3.borrow_mut()).subscript_move(__tmp_46, |__k| cpp_move!(__k)) }) + ({ (*m3.borrow_mut()).subscript_move(__tmp_46, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) @@ -612,7 +636,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(4)).as_pointer(),) { (__tmp_47,) => { - ({ (*m3.borrow_mut()).subscript_move(__tmp_47, |__k| cpp_move!(__k)) }) + ({ (*m3.borrow_mut()).subscript_move(__tmp_47, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) @@ -681,7 +705,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(8)).as_pointer(),) { (__tmp_49,) => { - ({ (*m3.borrow_mut()).subscript_move(__tmp_49, |__k| cpp_move!(__k)) }) + ({ (*m3.borrow_mut()).subscript_move(__tmp_49, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) @@ -708,7 +732,13 @@ fn main_0() -> i32 { assert!( (match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_50,) => { - ({ (*points.borrow_mut()).subscript_move(__tmp_50, |__k| cpp_move!(__k)) }) + ({ + (*points.borrow_mut()).subscript_move( + __tmp_50, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.x) @@ -717,7 +747,13 @@ fn main_0() -> i32 { assert!( (match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_51,) => { - ({ (*points.borrow_mut()).subscript_move(__tmp_51, |__k| cpp_move!(__k)) }) + ({ + (*points.borrow_mut()).subscript_move( + __tmp_51, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.y) @@ -740,7 +776,13 @@ fn main_0() -> i32 { assert!( (match (Rc::new(RefCell::new(8)).as_pointer(),) { (__tmp_53,) => { - ({ (*points.borrow_mut()).subscript_move(__tmp_53, |__k| cpp_move!(__k)) }) + ({ + (*points.borrow_mut()).subscript_move( + __tmp_53, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.x) @@ -749,7 +791,13 @@ fn main_0() -> i32 { assert!( (match (Rc::new(RefCell::new(8)).as_pointer(),) { (__tmp_54,) => { - ({ (*points.borrow_mut()).subscript_move(__tmp_54, |__k| cpp_move!(__k)) }) + ({ + (*points.borrow_mut()).subscript_move( + __tmp_54, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.y) @@ -812,21 +860,31 @@ fn main_0() -> i32 { let ptr_counts: Value, (Value>, Value)>> = Rc::new(RefCell::new(Map::new())); let ptr_key: Value> = Rc::new(RefCell::new((pk1.as_pointer()))); - ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer()) }).write(1); + ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer(), || 0_i32) }).write(1); (*ptr_key.borrow_mut()) = (pk2.as_pointer()); - ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer()) }).write(2); + ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer(), || 0_i32) }).write(2); { - ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer()) }) + ({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer(), || 0_i32) }) .with_mut(|__v| *__v = *__v + 3) }; assert!(({ ((*ptr_counts.borrow()).len() == 2_usize) })); - assert!(((({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer()) }).read()) == 5)); + assert!( + ((({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer(), || 0_i32) }).read()) == 5) + ); (*ptr_key.borrow_mut()) = (pk1.as_pointer()); - assert!(((({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer()) }).read()) == 1)); + assert!( + ((({ (*ptr_counts.borrow_mut()).subscript(ptr_key.as_pointer(), || 0_i32) }).read()) == 1) + ); { match (Rc::new(RefCell::new((pk2.as_pointer()))).as_pointer(),) { (__tmp_56,) => { - ({ (*ptr_counts.borrow_mut()).subscript_move(__tmp_56, |__k| cpp_move!(__k)) }) + ({ + (*ptr_counts.borrow_mut()).subscript_move( + __tmp_56, + |__k| cpp_move!(__k), + || 0_i32, + ) + }) } } .with_mut(|__v| *__v = *__v + 1) @@ -834,7 +892,13 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new((pk2.as_pointer()))).as_pointer(),) { (__tmp_57,) => { - ({ (*ptr_counts.borrow_mut()).subscript_move(__tmp_57, |__k| cpp_move!(__k)) }) + ({ + (*ptr_counts.borrow_mut()).subscript_move( + __tmp_57, + |__k| cpp_move!(__k), + || 0_i32, + ) + }) } } .read()) diff --git a/tests/unit/out/refcount/operator_traits.rs b/tests/unit/out/refcount/operator_traits.rs index 5c4e4b4246..41dc06aa98 100644 --- a/tests/unit/out/refcount/operator_traits.rs +++ b/tests/unit/out/refcount/operator_traits.rs @@ -192,11 +192,15 @@ fn main_0() -> i32 { ); let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(Lt { v: 2 })).as_pointer(),) { - (__tmp_11,) => ({ (*m.borrow_mut()).subscript_move(__tmp_11, |__k| cpp_move!(__k)) }), + (__tmp_11,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_11, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(20); match (Rc::new(RefCell::new(Lt { v: 1 })).as_pointer(),) { - (__tmp_12,) => ({ (*m.borrow_mut()).subscript_move(__tmp_12, |__k| cpp_move!(__k)) }), + (__tmp_12,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_12, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(10); assert!( @@ -213,7 +217,7 @@ fn main_0() -> i32 { assert!( ((match (Rc::new(RefCell::new(Lt { v: 2 })).as_pointer(),) { (__tmp_13,) => { - ({ (*m.borrow_mut()).subscript_move(__tmp_13, |__k| cpp_move!(__k)) }) + ({ (*m.borrow_mut()).subscript_move(__tmp_13, |__k| cpp_move!(__k), || 0_i32) }) } } .read()) diff --git a/tests/unit/out/refcount/sort_no_copy.rs b/tests/unit/out/refcount/sort_no_copy.rs index dd543cc663..d4bb1b88bb 100644 --- a/tests/unit/out/refcount/sort_no_copy.rs +++ b/tests/unit/out/refcount/sort_no_copy.rs @@ -388,11 +388,15 @@ fn main_0() -> i32 { assert!((copies_0.with(|rc| *rc.borrow()) == 0)); let bag_map: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (bag_vec.decay().offset(2_usize),) { - (__tmp_24,) => ({ (*bag_map.borrow_mut()).subscript_move(__tmp_24, |__k| cpp_move!(__k)) }), + (__tmp_24,) => { + ({ (*bag_map.borrow_mut()).subscript_move(__tmp_24, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(2); match (bag_vec.decay().offset(0_usize),) { - (__tmp_25,) => ({ (*bag_map.borrow_mut()).subscript_move(__tmp_25, |__k| cpp_move!(__k)) }), + (__tmp_25,) => { + ({ (*bag_map.borrow_mut()).subscript_move(__tmp_25, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(0); assert!( diff --git a/tests/unit/out/refcount/swap_map_no_copy.rs b/tests/unit/out/refcount/swap_map_no_copy.rs index 9b08c4d50a..b4179f9cb6 100644 --- a/tests/unit/out/refcount/swap_map_no_copy.rs +++ b/tests/unit/out/refcount/swap_map_no_copy.rs @@ -262,7 +262,13 @@ fn main_0() -> i32 { TrackedImpl::move_assign( &match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_0,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_0, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_0, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } }, _o.as_pointer(), @@ -273,7 +279,13 @@ fn main_0() -> i32 { TrackedImpl::move_assign( &match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_1,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_1, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_1, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } }, _o.as_pointer(), @@ -285,7 +297,13 @@ fn main_0() -> i32 { TrackedImpl::move_assign( &match (Rc::new(RefCell::new(3)).as_pointer(),) { (__tmp_2,) => { - ({ (*m2.borrow_mut()).subscript_move(__tmp_2, |__k| cpp_move!(__k)) }) + ({ + (*m2.borrow_mut()).subscript_move( + __tmp_2, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } }, _o.as_pointer(), @@ -295,26 +313,50 @@ fn main_0() -> i32 { cpp_swap!( match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_3,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_3, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_3, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } }, match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_4,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_4, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_4, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } ); assert!( (match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_5,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_5, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.v) == 20) && (match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_6,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_6, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.v) @@ -326,7 +368,13 @@ fn main_0() -> i32 { ((*m1.borrow()).len() == 1_usize) && (match (Rc::new(RefCell::new(3)).as_pointer(),) { (__tmp_7,) => { - ({ (*m1.borrow_mut()).subscript_move(__tmp_7, |__k| cpp_move!(__k)) }) + ({ + (*m1.borrow_mut()).subscript_move( + __tmp_7, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.v) @@ -336,14 +384,26 @@ fn main_0() -> i32 { (((*m2.borrow()).len() == 2_usize) && (match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_8,) => { - ({ (*m2.borrow_mut()).subscript_move(__tmp_8, |__k| cpp_move!(__k)) }) + ({ + (*m2.borrow_mut()).subscript_move( + __tmp_8, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.v) == 20)) && (match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_9,) => { - ({ (*m2.borrow_mut()).subscript_move(__tmp_9, |__k| cpp_move!(__k)) }) + ({ + (*m2.borrow_mut()).subscript_move( + __tmp_9, + |__k| cpp_move!(__k), + || ::default(), + ) + }) } } .with(|__s| __s.v) @@ -480,8 +540,11 @@ fn main_0() -> i32 { &match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_18,) => { ({ - (*maps.borrow_mut())[(0) as usize] - .subscript_move(__tmp_18, |__k| cpp_move!(__k)) + (*maps.borrow_mut())[(0) as usize].subscript_move( + __tmp_18, + |__k| cpp_move!(__k), + || ::default(), + ) }) } }, @@ -494,8 +557,11 @@ fn main_0() -> i32 { &match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_19,) => { ({ - (*maps.borrow_mut())[(1) as usize] - .subscript_move(__tmp_19, |__k| cpp_move!(__k)) + (*maps.borrow_mut())[(1) as usize].subscript_move( + __tmp_19, + |__k| cpp_move!(__k), + || ::default(), + ) }) } }, @@ -508,8 +574,11 @@ fn main_0() -> i32 { && (match (Rc::new(RefCell::new(2)).as_pointer(),) { (__tmp_20,) => { ({ - (*maps.borrow_mut())[(0) as usize] - .subscript_move(__tmp_20, |__k| cpp_move!(__k)) + (*maps.borrow_mut())[(0) as usize].subscript_move( + __tmp_20, + |__k| cpp_move!(__k), + || ::default(), + ) }) } } @@ -521,8 +590,11 @@ fn main_0() -> i32 { && (match (Rc::new(RefCell::new(1)).as_pointer(),) { (__tmp_21,) => { ({ - (*maps.borrow_mut())[(1) as usize] - .subscript_move(__tmp_21, |__k| cpp_move!(__k)) + (*maps.borrow_mut())[(1) as usize].subscript_move( + __tmp_21, + |__k| cpp_move!(__k), + || ::default(), + ) }) } } diff --git a/tests/unit/out/refcount/vector_iter_range_ctor.rs b/tests/unit/out/refcount/vector_iter_range_ctor.rs index e3e74ae648..9eb433d954 100644 --- a/tests/unit/out/refcount/vector_iter_range_ctor.rs +++ b/tests/unit/out/refcount/vector_iter_range_ctor.rs @@ -101,15 +101,21 @@ fn main_0() -> i32 { assert!(((v5[0_usize] as i32) == 10) && ((v5[4_usize] as i32) == 50)); let m: Value, Value)>> = Rc::new(RefCell::new(Map::new())); match (Rc::new(RefCell::new(1)).as_pointer(),) { - (__tmp_5,) => ({ (*m.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k)) }), + (__tmp_5,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_5, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(10); match (Rc::new(RefCell::new(2)).as_pointer(),) { - (__tmp_6,) => ({ (*m.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k)) }), + (__tmp_6,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_6, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(20); match (Rc::new(RefCell::new(3)).as_pointer(),) { - (__tmp_7,) => ({ (*m.borrow_mut()).subscript_move(__tmp_7, |__k| cpp_move!(__k)) }), + (__tmp_7,) => { + ({ (*m.borrow_mut()).subscript_move(__tmp_7, |__k| cpp_move!(__k), || 0_i32) }) + } } .write(30); let v6: Value, Value)>> = Rc::new(RefCell::new({ diff --git a/tests/unit/out/unsafe/clone_vs_move.rs b/tests/unit/out/unsafe/clone_vs_move.rs index e8e445544e..c742d4410a 100644 --- a/tests/unit/out/unsafe/clone_vs_move.rs +++ b/tests/unit/out/unsafe/clone_vs_move.rs @@ -190,7 +190,7 @@ unsafe fn main_0() -> i32 { { let mut i: i32 = 0; 'loop_: while ((i) < (N)) { - (*map1.subscript(&i)) = i; + (*map1.subscript(&i, || 0_i32)) = i; i.prefix_inc(); } } @@ -198,16 +198,16 @@ unsafe fn main_0() -> i32 { { let mut i: i32 = 0; 'loop_: while ((i) < (N)) { - assert!(((*map2.subscript(&i)) == (i))); - (*map2.subscript(&i)).prefix_inc(); + assert!(((*map2.subscript(&i, || 0_i32)) == (i))); + (*map2.subscript(&i, || 0_i32)).prefix_inc(); i.prefix_inc(); } } { let mut i: i32 = 0; 'loop_: while ((i) < (N)) { - assert!(((*map1.subscript(&i)) == (i))); - assert!(((*map2.subscript(&i)) == ((i) + (1)))); + assert!(((*map1.subscript(&i, || 0_i32)) == (i))); + assert!(((*map2.subscript(&i, || 0_i32)) == ((i) + (1)))); i.prefix_inc(); } } diff --git a/tests/unit/out/unsafe/find.rs b/tests/unit/out/unsafe/find.rs index 1f541ac53d..5d6d219bcd 100644 --- a/tests/unit/out/unsafe/find.rs +++ b/tests/unit/out/unsafe/find.rs @@ -54,9 +54,9 @@ unsafe fn main_0() -> i32 { }; let mut v_result_true: bool = it != v.end(); let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) = 1_f64; - (*m.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))) = 2_f64; - (*m.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k))) = 3_f64; + (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_f64)) = 1_f64; + (*m.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || 0_f64)) = 2_f64; + (*m.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k), || 0_f64)) = 3_f64; let mut m_begin: UnsafeBidirectionalIterator<(i32, f64)> = m.begin(); let mut m_end: UnsafeBidirectionalIterator<(i32, f64)> = m.end(); let mut m_result_true: bool = m_begin != m_end; diff --git a/tests/unit/out/unsafe/foreach_map.rs b/tests/unit/out/unsafe/foreach_map.rs index 8a5070649f..5a32028f6e 100644 --- a/tests/unit/out/unsafe/foreach_map.rs +++ b/tests/unit/out/unsafe/foreach_map.rs @@ -18,7 +18,7 @@ unsafe fn main_0() -> i32 { let mut i: i32 = 0; let mut k: i32 = 100; 'loop_: while ((i) < (100)) { - (*m.subscript(&i)) = ((k as f64) / (2_f64)); + (*m.subscript(&i, || 0_f64)) = ((k as f64) / (2_f64)); { i.prefix_inc(); k.prefix_dec() diff --git a/tests/unit/out/unsafe/map.rs b/tests/unit/out/unsafe/map.rs index aae6485d60..9690d193df 100644 --- a/tests/unit/out/unsafe/map.rs +++ b/tests/unit/out/unsafe/map.rs @@ -41,27 +41,27 @@ pub fn main() { } unsafe fn main_0() -> i32 { let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) = 1_u32; - (*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k))) = 2_u32; - (*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k))) = 3_u32; + (*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 1_u32; + (*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 2_u32; + (*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 3_u32; assert!(((m.len()) == (3_usize))); - assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) == (1_u32))); - assert!(((*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k))) == (2_u32))); - assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k))) == (3_u32))); + assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (1_u32))); + assert!(((*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (2_u32))); + assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (3_u32))); let mut x: i32 = 4; - (*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k))) = (x as u32); + (*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = (x as u32); assert!(((m.len()) == (3_usize))); - assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) == (1_u32))); - assert!(((*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k))) == (4_u32))); - assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k))) == (3_u32))); - (unsafe { foo_0((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k)))) }); - assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) == (1_u32))); - (unsafe { bar_1(&mut (*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k)))) }); - assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k))) == (4_u32))); - (*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) = (*m - .subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) - .wrapping_add((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k)))); - assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k))) == (5_u32))); + assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (1_u32))); + assert!(((*m.subscript_move(&mut 1_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (4_u32))); + assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (3_u32))); + (unsafe { foo_0((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32))) }); + assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (1_u32))); + (unsafe { bar_1(&mut (*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32))) }); + assert!(((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (4_u32))); + (*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = + (*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) + .wrapping_add((*m.subscript_move(&mut 2_i16, |__k| cpp_move_unsafe!(__k), || 0_u32))); + assert!(((*m.subscript_move(&mut 0_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (5_u32))); let mut end: UnsafeBidirectionalIterator<(i16, u32)> = m.end(); let mut it: UnsafeBidirectionalIterator<(i16, u32)> = m.find(&1_i16); let mut const_it: UnsafeBidirectionalIterator<(i16, u32)> = @@ -91,16 +91,16 @@ unsafe fn main_0() -> i32 { (*const_it.iter_deref()).1 }; assert!(((x4) == (0_u32))); - (*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k))) = 5_u32; + (*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 5_u32; let mut it4: UnsafeBidirectionalIterator<(i16, u32)> = m.find(&4_i16); let mut p: *mut u32 = (&mut (*it4.iter_deref()).1 as *mut u32); let mut x5: u32 = (*p); - assert!(((*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k))) == (5_u32))); + assert!(((*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (5_u32))); assert!((((*it4.iter_deref()).1) == (5_u32))); assert!(((*p) == (5_u32))); assert!(((x5) == (5_u32))); (*p).prefix_inc(); - assert!(((*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k))) == (6_u32))); + assert!(((*m.subscript_move(&mut 4_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) == (6_u32))); assert!((((*it4.iter_deref()).1) == (6_u32))); assert!(((*p) == (6_u32))); assert!(((x5) == (5_u32))); @@ -113,9 +113,9 @@ unsafe fn main_0() -> i32 { (*r).erase(&(it4).clone()); assert!((((*r).len()) == (3_usize))); assert!(m.find(&4_i16) == m.end()); - (*m.subscript_move(&mut 7_i16, |__k| cpp_move_unsafe!(__k))) = 7_u32; - (*m.subscript_move(&mut 8_i16, |__k| cpp_move_unsafe!(__k))) = 8_u32; - (*m.subscript_move(&mut 9_i16, |__k| cpp_move_unsafe!(__k))) = 9_u32; + (*m.subscript_move(&mut 7_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 7_u32; + (*m.subscript_move(&mut 8_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 8_u32; + (*m.subscript_move(&mut 9_i16, |__k| cpp_move_unsafe!(__k), || 0_u32)) = 9_u32; assert!((((*r).len()) == (6_usize))); assert!(((m.erase_key(&10_i16)) == (0_usize))); let mut key9: i32 = 9; @@ -135,10 +135,10 @@ unsafe fn main_0() -> i32 { assert!(((other_map.len()) == (0_usize))); let mut key0: (i32, i64) = (1, (1 as i64)); let mut value: f64 = 2_f64; - (*other_map.subscript(&key0)) = value; - value = (*other_map.subscript(&key0)); + (*other_map.subscript(&key0, || 0_f64)) = value; + value = (*other_map.subscript(&key0, || 0_f64)); assert!(((other_map.len()) == (1_usize))); - assert!(((*other_map.subscript(&key0)) == (value))); + assert!(((*other_map.subscript(&key0, || 0_f64)) == (value))); assert!(((m.len()) == (3_usize))); let mut k: i32 = 0; assert!((((*m.get(&(k as i16)).expect("out of range!")).1) == (5_u32))); @@ -182,7 +182,7 @@ unsafe fn main_0() -> i32 { { let mut i: u32 = 0_u32; 'loop_: while ((i as usize) < (indexes.len())) { - (*m2.subscript(&indexes[(i as usize)])) = ((i).wrapping_rem(2_u32) != 0); + (*m2.subscript(&indexes[(i as usize)], || false)) = ((i).wrapping_rem(2_u32) != 0); i.prefix_inc(); } } @@ -205,8 +205,8 @@ unsafe fn main_0() -> i32 { (__tmp_0,) => ((*&mut (*__tmp_0).0), (*&mut (*__tmp_0).1)), }); assert!(((m3.len()) == (2_usize))); - assert!(((*m3.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) == (2))); - assert!(((*m3.subscript_move(&mut 4, |__k| cpp_move_unsafe!(__k))) == (5))); + assert!(((*m3.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) == (2))); + assert!(((*m3.subscript_move(&mut 4, |__k| cpp_move_unsafe!(__k), || 0_i32)) == (5))); let mut hinted: UnsafeBidirectionalIterator<(i32, i32)> = { let _ = >::from(m3.end()); m3.emplace((6, 7)).0 @@ -219,17 +219,29 @@ unsafe fn main_0() -> i32 { let mut key8: i32 = 8; let mut tried_new: (UnsafeBidirectionalIterator<(i32, i32)>, bool) = m3.try_emplace(key8, || 9); assert!(((tried_new.1) as bool)); - assert!(((*m3.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k))) == (9))); + assert!(((*m3.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k), || 0_i32)) == (9))); assert!(((m3.len()) == (4_usize))); let mut points: UnsafeMap = UnsafeMap::new(); let mut point_new: (UnsafeBidirectionalIterator<(i32, Point)>, bool) = points.try_emplace(key1, || Point::new_2({ 3 }, { 4 })); assert!(((point_new.1) as bool)); - assert!((((*points.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).x) == (3))); - assert!((((*points.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).y) == (4))); + assert!( + (((*points.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || ::default())).x) + == (3)) + ); + assert!( + (((*points.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || ::default())).y) + == (4)) + ); points.emplace((key8, Point::new_2({ 5 }, { 6 }))); - assert!((((*points.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k))).x) == (5))); - assert!((((*points.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k))).y) == (6))); + assert!( + (((*points.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k), || ::default())).x) + == (5)) + ); + assert!( + (((*points.subscript_move(&mut 8, |__k| cpp_move_unsafe!(__k), || ::default())).y) + == (6)) + ); assert!(((points.len()) == (2_usize))); let mut mi: UnsafeBidirectionalIterator<(i32, i32)> = m3.begin(); let mr: *mut UnsafeBidirectionalIterator<(i32, i32)> = &mut (*{ @@ -262,18 +274,25 @@ unsafe fn main_0() -> i32 { let mut pk2: i32 = 0; let mut ptr_counts: UnsafeMap<*mut i32, (*mut i32, i32)> = UnsafeMap::new(); let mut ptr_key: *mut i32 = (&mut pk1 as *mut i32); - (*ptr_counts.subscript(&ptr_key)) = 1; + (*ptr_counts.subscript(&ptr_key, || 0_i32)) = 1; ptr_key = (&mut pk2 as *mut i32); - (*ptr_counts.subscript(&ptr_key)) = 2; - (*ptr_counts.subscript(&ptr_key)) += 3; + (*ptr_counts.subscript(&ptr_key, || 0_i32)) = 2; + (*ptr_counts.subscript(&ptr_key, || 0_i32)) += 3; assert!(((ptr_counts.len()) == (2_usize))); - assert!(((*ptr_counts.subscript(&ptr_key)) == (5))); + assert!(((*ptr_counts.subscript(&ptr_key, || 0_i32)) == (5))); ptr_key = (&mut pk1 as *mut i32); - assert!(((*ptr_counts.subscript(&ptr_key)) == (1))); - (*ptr_counts.subscript_move(&mut (&mut pk2 as *mut i32), |__k| cpp_move_unsafe!(__k))) += 1; + assert!(((*ptr_counts.subscript(&ptr_key, || 0_i32)) == (1))); + (*ptr_counts.subscript_move( + &mut (&mut pk2 as *mut i32), + |__k| cpp_move_unsafe!(__k), + || 0_i32, + )) += 1; assert!( - ((*ptr_counts.subscript_move(&mut (&mut pk2 as *mut i32), |__k| cpp_move_unsafe!(__k))) - == (6)) + ((*ptr_counts.subscript_move( + &mut (&mut pk2 as *mut i32), + |__k| cpp_move_unsafe!(__k), + || 0_i32 + )) == (6)) ); assert!(((pk1) == (0)) && ((pk2) == (0))); return 0; diff --git a/tests/unit/out/unsafe/map_try_emplace.rs b/tests/unit/out/unsafe/map_try_emplace.rs index c69023058a..58bd2654cd 100644 --- a/tests/unit/out/unsafe/map_try_emplace.rs +++ b/tests/unit/out/unsafe/map_try_emplace.rs @@ -93,8 +93,10 @@ pub static mut global_counter_8: std::cell::LazyCell = std::cell::LazyCell::new(|| unsafe { 0 }); pub static mut seed_9: std::cell::LazyCell = std::cell::LazyCell::new(|| unsafe { { - (*(*std::cell::LazyCell::force_mut(&mut *&raw mut global_map_6)) - .subscript(&(*std::cell::LazyCell::force_mut(&mut *&raw mut global_key_7)))) = 10; + (*(*std::cell::LazyCell::force_mut(&mut *&raw mut global_map_6)).subscript( + &(*std::cell::LazyCell::force_mut(&mut *&raw mut global_key_7)), + || 0_i32, + )) = 10; 0 } }); @@ -146,7 +148,7 @@ unsafe fn main_0() -> i32 { let mut k: i32 = 0; 'loop_: while ((k) < (3)) { if (((subset) & ((1) << (k))) != 0) { - (*m.subscript(&k)) = ((10) + (k)); + (*m.subscript(&k, || 0_i32)) = ((10) + (k)); size.prefix_inc(); } k.prefix_inc(); diff --git a/tests/unit/out/unsafe/map_try_emplace_lvalues.rs b/tests/unit/out/unsafe/map_try_emplace_lvalues.rs index 7847cbebe9..1964142b87 100644 --- a/tests/unit/out/unsafe/map_try_emplace_lvalues.rs +++ b/tests/unit/out/unsafe/map_try_emplace_lvalues.rs @@ -453,7 +453,7 @@ unsafe fn main_0() -> i32 { && (((*narrowed.0.iter_deref()).1) == (1_u32)) ); let mut changed: UnsafeMap = UnsafeMap::new(); - (*changed.subscript(&key)) = 10; + (*changed.subscript(&key, || 0_i32)) = 10; let mut effects: i32 = 0; let mut erased: (UnsafeBidirectionalIterator<(i32, i32)>, bool) = match (({ changed.erase_key(&key); @@ -468,7 +468,7 @@ unsafe fn main_0() -> i32 { }; assert!((((effects) == (1)) && (erased.1)) && (((*erased.0.iter_deref()).1) == (1))); let mut updated: (UnsafeBidirectionalIterator<(i32, i32)>, bool) = match (({ - (*changed.subscript(&key)).prefix_inc(); + (*changed.subscript(&key, || 0_i32)).prefix_inc(); { let __tmp_42 = &mut effects; (*__tmp_42).prefix_inc(); @@ -505,7 +505,7 @@ unsafe fn main_0() -> i32 { IterRange::new(keys.as_ptr(), keys.as_ptr().offset((6_i64) as isize)) { let mut k: i32 = (*k); - (*values.subscript(&k)) = 42; + (*values.subscript(&k, || 0_i32)) = 42; } } let mut moved: i32 = 0; @@ -587,7 +587,7 @@ unsafe fn main_0() -> i32 { 'loop_: for k in IterRange::new(keys.as_ptr(), keys.as_ptr().offset((6_i64) as isize)) { let mut k: i32 = (*k); assert!( - ((*values.subscript(&k)) + ((*values.subscript(&k, || 0_i32)) == (if (hit != 0) { 42 } else { @@ -611,7 +611,7 @@ unsafe fn main_0() -> i32 { IterRange::new(keys.as_ptr(), keys.as_ptr().offset((3_i64) as isize)) { let mut k: i32 = (*k); - (*selected.subscript(&k)).value = 42; + (*selected.subscript(&k, || ::default())).value = 42; } } let mut a: i32 = 0; @@ -753,7 +753,7 @@ unsafe fn main_0() -> i32 { IterRange::new(keys.as_ptr(), keys.as_ptr().offset((3_i64) as isize)) { let mut k: i32 = (*k); - (*values.subscript(&k)) = 42; + (*values.subscript(&k, || 0_i32)) = 42; } } let mut before: i32 = @@ -843,7 +843,7 @@ unsafe fn main_0() -> i32 { references.try_emplace(key, || Held::new_1({ __tmp_79 })) } }; - value = (*(*references.subscript(&key)).ptr) + value = (*(*references.subscript(&key, || ::default())).ptr) } }; assert!( @@ -888,7 +888,9 @@ unsafe fn main_0() -> i32 { arrays.try_emplace(key, || Held::new_3({ __tmp_82 }, { 0 })) } }; - value = (*(*arrays.subscript(&key)).ptr.offset((1) as isize)) + value = (*(*arrays.subscript(&key, || ::default())) + .ptr + .offset((1) as isize)) } }; assert!( @@ -912,7 +914,7 @@ unsafe fn main_0() -> i32 { IterRange::new(keys.as_ptr(), keys.as_ptr().offset((6_i64) as isize)) { let mut k: i32 = (*k); - (*values.subscript(&k)) = 42; + (*values.subscript(&k, || 0_i32)) = 42; } } let mut before: i32 = @@ -1027,7 +1029,7 @@ unsafe fn main_0() -> i32 { 'loop_: for k in IterRange::new(keys.as_ptr(), keys.as_ptr().offset((6_i64) as isize)) { let mut k: i32 = (*k); assert!( - ((*values.subscript(&k)) + ((*values.subscript(&k, || 0_i32)) == (if (hit != 0) { 42 } else { @@ -1077,7 +1079,7 @@ unsafe fn main_0() -> i32 { references.try_emplace(key, || Held::new_1({ __tmp_97 })) } }; - value = (*(*references.subscript(&key)).ptr) + value = (*(*references.subscript(&key, || ::default())).ptr) } }; assert!( @@ -1110,7 +1112,7 @@ unsafe fn main_0() -> i32 { owners.try_emplace(key, || Held::new_1({ __tmp_100 })) } }; - value = (*(*owners.subscript(&key)).ptr) + value = (*(*owners.subscript(&key, || ::default())).ptr) } }; assert!(((value) == (5))); diff --git a/tests/unit/out/unsafe/operator_traits.rs b/tests/unit/out/unsafe/operator_traits.rs index f5b3b7a7e2..ba7cf66570 100644 --- a/tests/unit/out/unsafe/operator_traits.rs +++ b/tests/unit/out/unsafe/operator_traits.rs @@ -240,10 +240,12 @@ unsafe fn main_0() -> i32 { .v) == (2)) ); let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move((&mut Lt { v: 2 }), |__k| cpp_move_unsafe!(__k))) = 20; - (*m.subscript_move((&mut Lt { v: 1 }), |__k| cpp_move_unsafe!(__k))) = 10; + (*m.subscript_move((&mut Lt { v: 2 }), |__k| cpp_move_unsafe!(__k), || 0_i32)) = 20; + (*m.subscript_move((&mut Lt { v: 1 }), |__k| cpp_move_unsafe!(__k), || 0_i32)) = 10; assert!((((*m.begin().iter_deref()).1) == (10))); - assert!(((*m.subscript_move((&mut Lt { v: 2 }), |__k| cpp_move_unsafe!(__k))) == (20))); + assert!( + ((*m.subscript_move((&mut Lt { v: 2 }), |__k| cpp_move_unsafe!(__k), || 0_i32)) == (20)) + ); return 0; } pub unsafe fn __cpp2rust_init_globals() {} diff --git a/tests/unit/out/unsafe/sort_no_copy.rs b/tests/unit/out/unsafe/sort_no_copy.rs index 800a63519d..2972188cb6 100644 --- a/tests/unit/out/unsafe/sort_no_copy.rs +++ b/tests/unit/out/unsafe/sort_no_copy.rs @@ -438,8 +438,16 @@ unsafe fn main_0() -> i32 { ); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); let mut bag_map: UnsafeMap = UnsafeMap::new(); - (*bag_map.subscript_move(&mut bag_vec[(2_usize)], |__k| cpp_move_unsafe!(__k))) = 2; - (*bag_map.subscript_move(&mut bag_vec[(0_usize)], |__k| cpp_move_unsafe!(__k))) = 0; + (*bag_map.subscript_move( + &mut bag_vec[(2_usize)], + |__k| cpp_move_unsafe!(__k), + || 0_i32, + )) = 2; + (*bag_map.subscript_move( + &mut bag_vec[(0_usize)], + |__k| cpp_move_unsafe!(__k), + || 0_i32, + )) = 0; assert!((((*bag_map.find(&bags[(2) as usize]).iter_deref()).1) == (2))); assert!(bag_map.find(&bags[(1) as usize]) == bag_map.end()); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); diff --git a/tests/unit/out/unsafe/swap_map_no_copy.rs b/tests/unit/out/unsafe/swap_map_no_copy.rs index 5a3c9def04..51ccc91646 100644 --- a/tests/unit/out/unsafe/swap_map_no_copy.rs +++ b/tests/unit/out/unsafe/swap_map_no_copy.rs @@ -364,14 +364,14 @@ unsafe fn main_0() -> i32 { (unsafe { let mut _o: Tracked = Tracked::new_1({ 10 }); Tracked::move_assign( - &mut (*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))), + &mut (*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || ::default())), &mut _o, ) }); (unsafe { let mut _o: Tracked = Tracked::new_1({ 20 }); Tracked::move_assign( - &mut (*m1.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))), + &mut (*m1.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || ::default())), &mut _o, ) }); @@ -379,29 +379,50 @@ unsafe fn main_0() -> i32 { (unsafe { let mut _o: Tracked = Tracked::new_1({ 30 }); Tracked::move_assign( - &mut (*m2.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k))), + &mut (*m2.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k), || ::default())), &mut _o, ) }); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); cpp_swap_unsafe!( - &mut (*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))), - &mut (*m1.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))) + &mut (*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || ::default())), + &mut (*m1.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || ::default())) ); assert!( - (((*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).v) == (20)) - && (((*m1.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))).v) == (10)) + (((*m1.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || ::default())).v) + == (20)) + && (((*m1.subscript_move( + &mut 2, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (10)) ); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); cpp_swap_unsafe!(&mut m1, &mut m2); assert!( ((m1.len()) == (1_usize)) - && (((*m1.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k))).v) == (30)) + && (((*m1.subscript_move( + &mut 3, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (30)) ); assert!( (((m2.len()) == (2_usize)) - && (((*m2.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).v) == (20))) - && (((*m2.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))).v) == (10)) + && (((*m2.subscript_move( + &mut 1, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (20))) + && (((*m2.subscript_move( + &mut 2, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (10)) ); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); let mut arr: [Tracked; 3] = [ @@ -469,27 +490,43 @@ unsafe fn main_0() -> i32 { (unsafe { let mut _o: Tracked = Tracked::new_1({ 1 }); Tracked::move_assign( - &mut (*maps[(0) as usize].subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))), + &mut (*maps[(0) as usize].subscript_move( + &mut 1, + |__k| cpp_move_unsafe!(__k), + || ::default(), + )), &mut _o, ) }); (unsafe { let mut _o: Tracked = Tracked::new_1({ 2 }); Tracked::move_assign( - &mut (*maps[(1) as usize].subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))), + &mut (*maps[(1) as usize].subscript_move( + &mut 2, + |__k| cpp_move_unsafe!(__k), + || ::default(), + )), &mut _o, ) }); cpp_swap_unsafe!(&mut maps[(0) as usize], &mut maps[(1) as usize]); assert!( ((maps[(0) as usize].len()) == (1_usize)) - && (((*maps[(0) as usize].subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))).v) - == (2)) + && (((*maps[(0) as usize].subscript_move( + &mut 2, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (2)) ); assert!( ((maps[(1) as usize].len()) == (1_usize)) - && (((*maps[(1) as usize].subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))).v) - == (1)) + && (((*maps[(1) as usize].subscript_move( + &mut 1, + |__k| cpp_move_unsafe!(__k), + || ::default() + )) + .v) == (1)) ); assert!(((*std::cell::LazyCell::force_mut(&mut *&raw mut copies_0)) == (0))); let mut c1: CopyOnly = CopyOnly::new({ 1 }); diff --git a/tests/unit/out/unsafe/vector_iter_range_ctor.rs b/tests/unit/out/unsafe/vector_iter_range_ctor.rs index f0bc889b3e..f0a723d726 100644 --- a/tests/unit/out/unsafe/vector_iter_range_ctor.rs +++ b/tests/unit/out/unsafe/vector_iter_range_ctor.rs @@ -117,9 +117,9 @@ unsafe fn main_0() -> i32 { assert!(((v5.len()) == (5_usize))); assert!(((v5[(0_usize)] as i32) == (10)) && ((v5[(4_usize)] as i32) == (50))); let mut m: UnsafeMap = UnsafeMap::new(); - (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k))) = 10; - (*m.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k))) = 20; - (*m.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k))) = 30; + (*m.subscript_move(&mut 1, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 10; + (*m.subscript_move(&mut 2, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 20; + (*m.subscript_move(&mut 3, |__k| cpp_move_unsafe!(__k), || 0_i32)) = 30; let mut v6: Vec<(i32, i32)> = { let mut __tmp_6 = { m.begin() }; let mut __tmp_7 = { m.end() };