Skip to content

Commit 987b0c4

Browse files
committed
Update tests
1 parent 61ef2f8 commit 987b0c4

3 files changed

Lines changed: 11 additions & 21 deletions

File tree

tests/unit/out/refcount/bool_condition_logical.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn main_0() -> i32 {
4545
let zero: Value<i32> = Rc::new(RefCell::new(0));
4646
let storage: Value<i32> = Rc::new(RefCell::new(7));
4747
let p: Value<Ptr<i32>> = Rc::new(RefCell::new((storage.as_pointer())));
48-
let np: Value<Ptr<i32>> = Rc::new(RefCell::new(Default::default()));
48+
let np: Value<Ptr<i32>> = Rc::new(RefCell::new(Ptr::<i32>::null()));
4949
let u: Value<u32> = Rc::new(RefCell::new(4_u32));
5050
let code: Value<Code> = Rc::new(RefCell::new(Code::CODE_OK));
5151
if ((*n.borrow()) != 0) && (!(*p.borrow()).is_null()) {
@@ -127,7 +127,7 @@ fn main_0() -> i32 {
127127
assert!(true);
128128
}
129129
let cp: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal("hi")));
130-
let cnp: Value<Ptr<u8>> = Rc::new(RefCell::new(Default::default()));
130+
let cnp: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::<u8>::null()));
131131
if ((*x.borrow()) > (*y.borrow())) && (!(*cp.borrow()).is_null()) {
132132
assert!(true);
133133
}

tests/unit/out/refcount/bool_condition_logical_c.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn main_0() -> i32 {
4545
let zero: Value<i32> = Rc::new(RefCell::new(0));
4646
let storage: Value<i32> = Rc::new(RefCell::new(7));
4747
let p: Value<Ptr<i32>> = Rc::new(RefCell::new((storage.as_pointer())));
48-
let np: Value<Ptr<i32>> = Rc::new(RefCell::new(Default::default()));
48+
let np: Value<Ptr<i32>> = Rc::new(RefCell::new(Ptr::<i32>::null()));
4949
let u: Value<u32> = Rc::new(RefCell::new(4_u32));
5050
let code: Value<Code> = Rc::new(RefCell::new(Code::CODE_OK));
5151
if (((((*n.borrow()) != 0) && (!(*p.borrow()).is_null())) as i32) != 0) {
@@ -115,8 +115,8 @@ fn main_0() -> i32 {
115115
assert!((1 != 0));
116116
}
117117
let s: Value<i32> = Rc::new(RefCell::new(-1_i32));
118-
if (((((((*p.borrow()) != (Default::default())) as i32) != 0)
119-
&& ((((*s.borrow()) < 0) as i32) != 0)) as i32)
118+
if ((((((!((*p.borrow()).is_null())) as i32) != 0) && ((((*s.borrow()) < 0) as i32) != 0))
119+
as i32)
120120
!= 0)
121121
{
122122
assert!((1 != 0));
@@ -133,10 +133,7 @@ fn main_0() -> i32 {
133133
assert!((1 != 0));
134134
}
135135
let ull: Value<u64> = Rc::new(RefCell::new(7));
136-
if (((((((*p.borrow()) != (Default::default())) as i32) != 0) && ((*ull.borrow()) != 0))
137-
as i32)
138-
!= 0)
139-
{
136+
if ((((((!((*p.borrow()).is_null())) as i32) != 0) && ((*ull.borrow()) != 0)) as i32) != 0) {
140137
assert!((1 != 0));
141138
}
142139
if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) && ((*ull.borrow()) != 0)) as i32) != 0) {
@@ -154,7 +151,7 @@ fn main_0() -> i32 {
154151
assert!((1 != 0));
155152
}
156153
let cp: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal("hi")));
157-
let cnp: Value<Ptr<u8>> = Rc::new(RefCell::new(Default::default()));
154+
let cnp: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::<u8>::null()));
158155
if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) && (!(*cp.borrow()).is_null())) as i32)
159156
!= 0)
160157
{
@@ -193,8 +190,7 @@ fn main_0() -> i32 {
193190
{
194191
assert!((0 != 0));
195192
}
196-
if ((((((((((*p.borrow()) != (Default::default())) as i32) != 0)
197-
&& (({ returns_one_1() }) != 0)) as i32)
193+
if (((((((((!((*p.borrow()).is_null())) as i32) != 0) && (({ returns_one_1() }) != 0)) as i32)
198194
!= 0)
199195
&& ((((*n.borrow()) != 0) as i32) != 0)) as i32)
200196
!= 0)

tests/unit/out/unsafe/bool_condition_logical_c.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,7 @@ unsafe fn main_0() -> i32 {
102102
assert!((1 != 0));
103103
}
104104
let mut s: i32 = -1_i32;
105-
if (((((((p) != ((0 as *mut ::libc::c_void) as *mut i32)) as i32) != 0)
106-
&& ((((s) < (0)) as i32) != 0)) as i32)
107-
!= 0)
108-
{
105+
if ((((((!((p).is_null())) as i32) != 0) && ((((s) < (0)) as i32) != 0)) as i32) != 0) {
109106
assert!((1 != 0));
110107
}
111108
let mut k: u32 = 2;
@@ -117,9 +114,7 @@ unsafe fn main_0() -> i32 {
117114
assert!((1 != 0));
118115
}
119116
let mut ull: u64 = 7;
120-
if (((((((p) != ((0 as *mut ::libc::c_void) as *mut i32)) as i32) != 0) && (ull != 0)) as i32)
121-
!= 0)
122-
{
117+
if ((((((!((p).is_null())) as i32) != 0) && (ull != 0)) as i32) != 0) {
123118
assert!((1 != 0));
124119
}
125120
if (((((((x) > (y)) as i32) != 0) && (ull != 0)) as i32) != 0) {
@@ -158,8 +153,7 @@ unsafe fn main_0() -> i32 {
158153
if (((((((x) < (y)) as i32) != 0) || (!((unsafe { returns_one_1() }) != 0))) as i32) != 0) {
159154
assert!((0 != 0));
160155
}
161-
if ((((((((((p) != ((0 as *mut ::libc::c_void) as *mut i32)) as i32) != 0)
162-
&& ((unsafe { returns_one_1() }) != 0)) as i32)
156+
if (((((((((!((p).is_null())) as i32) != 0) && ((unsafe { returns_one_1() }) != 0)) as i32)
163157
!= 0)
164158
&& ((((n) != (0)) as i32) != 0)) as i32)
165159
!= 0)

0 commit comments

Comments
 (0)