Merge pull request #126 from nats-io/tyler_fix_port_signedness

Fix port signedness for ServerInfo
nats-io · Nov 19, 2020 · 51f34b2 · 51f34b2
2 parents 6242d68 + ccddc6f
commit 51f34b2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 0.8.6
+
+## Bug Fixes
+
+- #126 Fix port signedness issue on ServerInfo which
+  prevented connecting to servers on ports over i16::MAX.
+
 # 0.8.5
 
 ## Improvements

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nats"
-version = "0.8.5"
+version = "0.8.6"
 description = "A Rust NATS client"
 authors = ["Derek Collison <[email protected]>", "Tyler Neely <[email protected]>", "Stjepan Glavina <[email protected]>"]
 edition = "2018"

diff --git a/src/lib.rs b/src/lib.rs
@@ -241,7 +241,7 @@ struct ServerInfo {
     /// The host specified in the cluster parameter/options.
     pub host: String,
     /// The port number specified in the cluster parameter/options.
-    pub port: i16,
+    pub port: u16,
     /// The version of the NATS server.
     pub version: String,
     /// If this is set, then the server should try to authenticate upon connect.
@@ -271,7 +271,7 @@ impl ServerInfo {
             server_id: obj["server_id"].take_string()?,
             server_name: obj["server_name"].take_string().unwrap_or_default(),
             host: obj["host"].take_string()?,
-            port: obj["port"].as_i16()?,
+            port: obj["port"].as_u16()?,
             version: obj["version"].take_string()?,
             auth_required: obj["auth_required"].as_bool().unwrap_or(false),
             tls_required: obj["tls_required"].as_bool().unwrap_or(false),