Rename username fields to user_name.

src/proto/server/credentials.rs

@@ -51,7 +51,7 @@ impl Credentials {
 
   pub fn into_login_request(self, version: Version) -> LoginRequest {
     LoginRequest {
-      username: self.user_name,
+      user_name: self.user_name,
       password: self.password,
       digest: self.digest,
       major: version.major,
@@ -116,7 +116,7 @@ mod tests {
     assert_eq!(
       credentials.into_login_request(version),
       LoginRequest {
-        username: user_name,
+        user_name,
         password,
         digest,
         major: 13,

src/proto/server/request.rs

@@ -369,8 +369,7 @@ impl ValueDecode for FileSearchRequest {
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct LoginRequest {
-  // TODO: Rename to `user_name`.
-  pub username: String,
+  pub user_name: String,
   pub password: String,
   pub digest: String,
   pub major: u32,
@@ -379,7 +378,7 @@ pub struct LoginRequest {
 
 impl WriteToPacket for LoginRequest {
   fn write_to_packet(&self, packet: &mut MutPacket) -> io::Result<()> {
-    packet.write_value(&self.username)?;
+    packet.write_value(&self.user_name)?;
     packet.write_value(&self.password)?;
     packet.write_value(&self.major)?;
     packet.write_value(&self.digest)?;
@@ -390,7 +389,7 @@ impl WriteToPacket for LoginRequest {
 
 impl ValueEncode for LoginRequest {
   fn encode(&self, encoder: &mut ValueEncoder) -> Result<(), ValueEncodeError> {
-    encoder.encode_string(&self.username)?;
+    encoder.encode_string(&self.user_name)?;
     encoder.encode_string(&self.password)?;
     encoder.encode_u32(self.major)?;
     encoder.encode_string(&self.digest)?;
@@ -400,13 +399,13 @@ impl ValueEncode for LoginRequest {
 
 impl ValueDecode for LoginRequest {
   fn decode_from(decoder: &mut ValueDecoder) -> Result<Self, ValueDecodeError> {
-    let username = decoder.decode()?;
+    let user_name = decoder.decode()?;
     let password = decoder.decode()?;
     let major = decoder.decode()?;
     let digest = decoder.decode()?;
     let minor = decoder.decode()?;
     Ok(LoginRequest {
-      username,
+      user_name,
       password,
       digest,
       major,
@@ -421,26 +420,26 @@ impl ValueDecode for LoginRequest {
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PeerAddressRequest {
-  pub username: String,
+  pub user_name: String,
 }
 
 impl WriteToPacket for PeerAddressRequest {
   fn write_to_packet(&self, packet: &mut MutPacket) -> io::Result<()> {
-    packet.write_value(&self.username)?;
+    packet.write_value(&self.user_name)?;
     Ok(())
   }
 }
 
 impl ValueEncode for PeerAddressRequest {
   fn encode(&self, encoder: &mut ValueEncoder) -> Result<(), ValueEncodeError> {
-    encoder.encode_string(&self.username)
+    encoder.encode_string(&self.user_name)
   }
 }
 
 impl ValueDecode for PeerAddressRequest {
   fn decode_from(decoder: &mut ValueDecoder) -> Result<Self, ValueDecodeError> {
-    let username = decoder.decode()?;
-    Ok(PeerAddressRequest { username: username })
+    let user_name = decoder.decode()?;
+    Ok(PeerAddressRequest { user_name })
   }
 }
 
@@ -694,7 +693,7 @@ mod tests {
   #[test]
   fn from_login_request() {
     let request = LoginRequest {
-      username: "alice".to_string(),
+      user_name: "alice".to_string(),
       password: "sekrit".to_string(),
       digest: "abcdef".to_string(),
       major: 13,
@@ -709,7 +708,7 @@ mod tests {
   #[test]
   fn roundtrip_login_request() {
     roundtrip(ServerRequest::LoginRequest(LoginRequest {
-      username: "alice".to_string(),
+      user_name: "alice".to_string(),
       password: "sekrit".to_string(),
       digest: "abcdef".to_string(),
       major: 13,
@@ -720,7 +719,7 @@ mod tests {
   #[test]
   fn from_peer_address_request() {
     let request = PeerAddressRequest {
-      username: "alice".to_string(),
+      user_name: "alice".to_string(),
     };
     assert_eq!(
       ServerRequest::from(request.clone()),
@@ -731,7 +730,7 @@ mod tests {
   #[test]
   fn roundtrip_peer_address_request() {
     roundtrip(ServerRequest::PeerAddressRequest(PeerAddressRequest {
-      username: "alice".to_string(),
+      user_name: "alice".to_string(),
     }))
   }
 

src/proto/server/response.rs

@@ -543,24 +543,24 @@ impl ValueDecode for ParentSpeedRatioResponse {
 
 #[derive(Debug, Eq, PartialEq)]
 pub struct PeerAddressResponse {
-  username: String,
+  user_name: String,
   ip: net::Ipv4Addr,
   port: u16,
 }
 
 impl ReadFromPacket for PeerAddressResponse {
   fn read_from_packet(packet: &mut Packet) -> Result<Self, PacketReadError> {
-    let username = packet.read_value()?;
+    let user_name = packet.read_value()?;
     let ip = packet.read_value()?;
     let port = packet.read_value()?;
 
-    Ok(PeerAddressResponse { username, ip, port })
+    Ok(PeerAddressResponse { user_name, ip, port })
   }
 }
 
 impl ValueEncode for PeerAddressResponse {
   fn encode(&self, encoder: &mut ValueEncoder) -> Result<(), ValueEncodeError> {
-    encoder.encode(&self.username)?;
+    encoder.encode(&self.user_name)?;
     encoder.encode(&self.ip)?;
     encoder.encode_u16(self.port)
   }
@@ -568,10 +568,10 @@ impl ValueEncode for PeerAddressResponse {
 
 impl ValueDecode for PeerAddressResponse {
   fn decode_from(decoder: &mut ValueDecoder) -> Result<Self, ValueDecodeError> {
-    let username = decoder.decode()?;
+    let user_name = decoder.decode()?;
     let ip = decoder.decode()?;
     let port = decoder.decode()?;
-    Ok(PeerAddressResponse { username, ip, port })
+    Ok(PeerAddressResponse { user_name, ip, port })
   }
 }
 
@@ -1455,7 +1455,7 @@ mod tests {
   #[test]
   fn roundtrip_peer_address() {
     roundtrip(ServerResponse::PeerAddressResponse(PeerAddressResponse {
-      username: "alice".to_string(),
+      user_name: "alice".to_string(),
       ip: net::Ipv4Addr::new(127, 0, 0, 1),
       port: 1337,
     }))