@@ -1580,29 +1580,29 @@ mod test {
1580
1580
#[ test]
1581
1581
#[ ignore( cfg( target_os = "freebsd" ) ) ]
1582
1582
fn test_uv_ll_struct_size_sockaddr_in6 ( ) {
1583
- let native_handle_size =
1583
+ let foreign_handle_size =
1584
1584
rustrt:: rust_uv_helper_sockaddr_in6_size ( ) ;
1585
1585
let rust_handle_size = sys:: size_of :: < sockaddr_in6 > ( ) ;
1586
1586
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) ;
1588
1588
log ( debug, output) ;
1589
1589
// FIXME #1645 .. rust appears to pad structs to the nearest byte..?
1590
1590
// .. can't get the uv::ll::sockaddr_in6 to == 28 :/
1591
1591
// .. so the type always appears to be 32 in size.. which is
1592
1592
// good, i guess.. better too big than too little
1593
- assert ( 4 u+native_handle_size as uint ) == rust_handle_size;
1593
+ assert ( 4 u+foreign_handle_size as uint ) == rust_handle_size;
1594
1594
}
1595
1595
#[ test]
1596
1596
#[ ignore( reason = "questionable size calculations" ) ]
1597
1597
fn test_uv_ll_struct_size_addr_in ( ) {
1598
- let native_handle_size =
1598
+ let foreign_handle_size =
1599
1599
rustrt:: rust_uv_helper_addr_in_size ( ) ;
1600
1600
let rust_handle_size = sys:: size_of :: < addr_in > ( ) ;
1601
1601
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) ;
1603
1603
log ( debug, output) ;
1604
1604
// FIXME #1645 .. see note above about struct padding
1605
- assert ( 4 u+native_handle_size as uint ) == rust_handle_size;
1605
+ assert ( 4 u+foreign_handle_size as uint ) == rust_handle_size;
1606
1606
}
1607
1607
1608
1608
#[ test]
@@ -1633,25 +1633,25 @@ mod test {
1633
1633
#[ ignore( cfg( target_os = "freebsd" ) ) ]
1634
1634
#[ ignore( cfg( target_os = "win32" ) ) ]
1635
1635
fn test_uv_ll_struct_size_uv_getaddrinfo_t ( ) {
1636
- let native_handle_size =
1636
+ let foreign_handle_size =
1637
1637
rustrt:: rust_uv_helper_uv_getaddrinfo_t_size ( ) ;
1638
1638
let rust_handle_size = sys:: size_of :: < uv_getaddrinfo_t > ( ) ;
1639
1639
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) ;
1641
1641
log ( debug, output) ;
1642
- assert native_handle_size as uint == rust_handle_size;
1642
+ assert foreign_handle_size as uint == rust_handle_size;
1643
1643
}
1644
1644
#[ test]
1645
1645
#[ ignore( cfg( target_os = "freebsd" ) ) ]
1646
1646
#[ ignore( cfg( target_os = "macos" ) ) ]
1647
1647
#[ ignore( cfg( target_os = "win32" ) ) ]
1648
1648
fn test_uv_ll_struct_size_addrinfo ( ) {
1649
- let native_handle_size =
1649
+ let foreign_handle_size =
1650
1650
rustrt:: rust_uv_helper_addrinfo_size ( ) ;
1651
1651
let rust_handle_size = sys:: size_of :: < addrinfo > ( ) ;
1652
1652
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) ;
1654
1654
log ( debug, output) ;
1655
- assert native_handle_size as uint == rust_handle_size;
1655
+ assert foreign_handle_size as uint == rust_handle_size;
1656
1656
}
1657
1657
}
0 commit comments