Skip to content

Commit dc98165

Browse files
committed
Mop up a few extra native -> foreign changes.
1 parent 742c05f commit dc98165

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/libstd/uv_ll.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,29 +1580,29 @@ mod test {
15801580
#[test]
15811581
#[ignore(cfg(target_os = "freebsd"))]
15821582
fn test_uv_ll_struct_size_sockaddr_in6() {
1583-
let native_handle_size =
1583+
let foreign_handle_size =
15841584
rustrt::rust_uv_helper_sockaddr_in6_size();
15851585
let rust_handle_size = sys::size_of::<sockaddr_in6>();
15861586
let output = #fmt("sockaddr_in6 -- foreign: %u rust: %u",
1587-
native_handle_size as uint, rust_handle_size);
1587+
foreign_handle_size as uint, rust_handle_size);
15881588
log(debug, output);
15891589
// FIXME #1645 .. rust appears to pad structs to the nearest byte..?
15901590
// .. can't get the uv::ll::sockaddr_in6 to == 28 :/
15911591
// .. so the type always appears to be 32 in size.. which is
15921592
// good, i guess.. better too big than too little
1593-
assert (4u+native_handle_size as uint) == rust_handle_size;
1593+
assert (4u+foreign_handle_size as uint) == rust_handle_size;
15941594
}
15951595
#[test]
15961596
#[ignore(reason = "questionable size calculations")]
15971597
fn test_uv_ll_struct_size_addr_in() {
1598-
let native_handle_size =
1598+
let foreign_handle_size =
15991599
rustrt::rust_uv_helper_addr_in_size();
16001600
let rust_handle_size = sys::size_of::<addr_in>();
16011601
let output = #fmt("addr_in -- foreign: %u rust: %u",
1602-
native_handle_size as uint, rust_handle_size);
1602+
foreign_handle_size as uint, rust_handle_size);
16031603
log(debug, output);
16041604
// FIXME #1645 .. see note above about struct padding
1605-
assert (4u+native_handle_size as uint) == rust_handle_size;
1605+
assert (4u+foreign_handle_size as uint) == rust_handle_size;
16061606
}
16071607

16081608
#[test]
@@ -1633,25 +1633,25 @@ mod test {
16331633
#[ignore(cfg(target_os = "freebsd"))]
16341634
#[ignore(cfg(target_os = "win32"))]
16351635
fn test_uv_ll_struct_size_uv_getaddrinfo_t() {
1636-
let native_handle_size =
1636+
let foreign_handle_size =
16371637
rustrt::rust_uv_helper_uv_getaddrinfo_t_size();
16381638
let rust_handle_size = sys::size_of::<uv_getaddrinfo_t>();
16391639
let output = #fmt("uv_getaddrinfo_t -- foreign: %u rust: %u",
1640-
native_handle_size as uint, rust_handle_size);
1640+
foreign_handle_size as uint, rust_handle_size);
16411641
log(debug, output);
1642-
assert native_handle_size as uint == rust_handle_size;
1642+
assert foreign_handle_size as uint == rust_handle_size;
16431643
}
16441644
#[test]
16451645
#[ignore(cfg(target_os = "freebsd"))]
16461646
#[ignore(cfg(target_os = "macos"))]
16471647
#[ignore(cfg(target_os = "win32"))]
16481648
fn test_uv_ll_struct_size_addrinfo() {
1649-
let native_handle_size =
1649+
let foreign_handle_size =
16501650
rustrt::rust_uv_helper_addrinfo_size();
16511651
let rust_handle_size = sys::size_of::<addrinfo>();
16521652
let output = #fmt("addrinfo -- foreign: %u rust: %u",
1653-
native_handle_size as uint, rust_handle_size);
1653+
foreign_handle_size as uint, rust_handle_size);
16541654
log(debug, output);
1655-
assert native_handle_size as uint == rust_handle_size;
1655+
assert foreign_handle_size as uint == rust_handle_size;
16561656
}
16571657
}

0 commit comments

Comments
 (0)