Disambiguated method call for ntoh

metaphorshear · metaphorshear · commit 43d135594ab5 · 2020-01-07T15:54:05.000-06:00
diff --git a/vm/src/stdlib/socket.rs b/vm/src/stdlib/socket.rs
@@ -445,12 +445,12 @@ fn socket_inet_ntoa(packed_ip: PyBytesRef, vm: &VirtualMachine) -> PyResult {
     Ok(vm.new_str(Ipv4Addr::from(ip_num).to_string()))
 }
 
-fn socket_hton<U: num_traits::PrimInt>(host: U, _vm: &VirtualMachine) -> U {
-    host.to_be()
+fn socket_hton<U: num_traits::int::PrimInt>(host: U, _vm: &VirtualMachine) -> U {
+    U::to_be(host)
 }
 
-fn socket_ntoh<U: num_traits::PrimInt>(network: U, _vm: &VirtualMachine) -> U {
-   network.from_be() 
+fn socket_ntoh<U: num_traits::int::PrimInt>(network: U, _vm: &VirtualMachine) -> U {
+   U::from_be(network) 
 }
 
 #[derive(FromArgs)]

Original file line number	Diff line number	Diff line change
`@@ -445,12 +445,12 @@ fn socket_inet_ntoa(packed_ip: PyBytesRef, vm: &VirtualMachine) -> PyResult {`
`445`	`445`	`Ok(vm.new_str(Ipv4Addr::from(ip_num).to_string()))`
`446`	`446`	`}`
`447`	`447`
`448`		`-fn socket_hton<U: num_traits::PrimInt>(host: U, _vm: &VirtualMachine) -> U {`
`449`		`- host.to_be()`
	`448`	`+fn socket_hton<U: num_traits::int::PrimInt>(host: U, _vm: &VirtualMachine) -> U {`
	`449`	`+ U::to_be(host)`
`450`	`450`	`}`
`451`	`451`
`452`		`-fn socket_ntoh<U: num_traits::PrimInt>(network: U, _vm: &VirtualMachine) -> U {`
`453`		`- network.from_be()`
	`452`	`+fn socket_ntoh<U: num_traits::int::PrimInt>(network: U, _vm: &VirtualMachine) -> U {`
	`453`	`+ U::from_be(network)`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`#[derive(FromArgs)]`