commit 4c84abbeac61be4176075cfa84865f82654290a2
author Austin Schuh <austin.linux@gmail.com> Sun Jun 20 18:16:32 2021 -0700
committer Austin Schuh <austin.linux@gmail.com> Sun Jun 20 18:17:03 2021 -0700
tree 9bda6cdef424caa11fc0c76bf18b974dd12546cf
parent 3223ac1f2555c4ce986091a38b9a72240025dc6b

Convert team_number to use string_view

Remove StringToNumber while we are here since it has been replaced by
absl and is used in exactly 1 spot.

Change-Id: Idfdb7876208608819b855c42f930a7a10ada3855
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

aos/network/BUILD

diff --git a/aos/network/BUILD b/aos/network/BUILD
index e6ff5af..067ae35 100644
--- a/aos/network/BUILD
+++ b/aos/network/BUILD
@@ -105,8 +105,8 @@
     ],
     target_compatible_with = ["@platforms//os:linux"],
     deps = [
-        "//aos/util:string_to_num",
         "@com_github_google_glog//:glog",
+        "@com_google_absl//absl/strings",
     ],
 )
 

aos/network/team_number.cc

diff --git a/aos/network/team_number.cc b/aos/network/team_number.cc
index 1f71946..0bd0cf7 100644
--- a/aos/network/team_number.cc
+++ b/aos/network/team_number.cc
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "aos/util/string_to_num.h"
+#include "absl/strings/numbers.h"
 
 DEFINE_string(
     override_hostname, "",
@@ -16,16 +16,17 @@
 namespace network {
 namespace team_number_internal {
 
-std::optional<uint16_t> ParseRoborioTeamNumber(const std::string &hostname) {
+std::optional<uint16_t> ParseRoborioTeamNumber(
+    const std::string_view hostname) {
   for (size_t i = 0; i < hostname.size(); i++) {
     if (hostname[i] == '-') {
-      const std::string num_as_s =
+      const std::string_view num_as_s =
           hostname[hostname.size() - 1] == 'C'
               ? hostname.substr(i + 1, hostname.size() - 5 - i)
               : hostname.substr(i + 1);
 
       int num;
-      if (!::aos::util::StringToNumber(num_as_s, &num)) {
+      if (!absl::SimpleAtoi(num_as_s, &num)) {
         return std::nullopt;
       }
       if (hostname.substr(0, i) == "roboRIO" &&
@@ -38,7 +39,7 @@
   return std::nullopt;
 }
 
-std::optional<uint16_t> ParsePiTeamNumber(const std::string &hostname) {
+std::optional<uint16_t> ParsePiTeamNumber(const std::string_view hostname) {
   if (hostname.substr(0, 3) != "pi-") {
     return std::nullopt;
   }
@@ -52,10 +53,10 @@
   if (second_separator == hostname.npos) {
     return std::nullopt;
   }
-  const std::string number_string =
+  const std::string_view number_string =
       hostname.substr(first_separator, second_separator - first_separator);
   int number;
-  if (!util::StringToNumber(number_string, &number)) {
+  if (!absl::SimpleAtoi(number_string, &number)) {
     return std::nullopt;
   }
   return number;
@@ -74,8 +75,8 @@
 
   const char *override_number = getenv("AOS_TEAM_NUMBER");
   if (override_number != nullptr) {
-    uint16_t result;
-    if (!::aos::util::StringToNumber(override_number, &result)) {
+    uint32_t result;
+    if (!absl::SimpleAtoi(override_number, &result)) {
       LOG(FATAL) << "Error parsing AOS_TEAM_NUMBER: " << override_number;
     }
     LOG(WARNING)
@@ -121,7 +122,7 @@
 
 void OverrideTeamNumber(uint16_t team) { override_team = team; }
 
-std::optional<uint16_t> ParsePiNumber(const std::string &hostname) {
+std::optional<uint16_t> ParsePiNumber(const std::string_view hostname) {
   if (hostname.substr(0, 3) != "pi-") {
     return std::nullopt;
   }
@@ -135,14 +136,14 @@
   if (second_separator == hostname.npos) {
     return std::nullopt;
   }
-  const std::string number_string = hostname.substr(
+  const std::string_view number_string = hostname.substr(
       second_separator + 1, hostname.size() - second_separator - 1);
   if (number_string.size() == 0) {
     return std::nullopt;
   }
 
   int number;
-  if (!util::StringToNumber(number_string, &number)) {
+  if (!absl::SimpleAtoi(number_string, &number)) {
     return std::nullopt;
   }
   return number;

aos/network/team_number.h

diff --git a/aos/network/team_number.h b/aos/network/team_number.h
index c2954b6..8effc27 100644
--- a/aos/network/team_number.h
+++ b/aos/network/team_number.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 
 #include <optional>
-#include <string>
+#include <string_view>
 
 #include "glog/logging.h"
 
@@ -29,14 +29,14 @@
 void OverrideTeamNumber(uint16_t team);
 
 // Returns the pi number for a pi formated hostname.  pi-team#-pi# (pi-971-5)
-std::optional<uint16_t> ParsePiNumber(const std::string &hostname);
+std::optional<uint16_t> ParsePiNumber(const std::string_view hostname);
 
 namespace team_number_internal {
 
-std::optional<uint16_t> ParseRoborioTeamNumber(const std::string &hostname);
+std::optional<uint16_t> ParseRoborioTeamNumber(const std::string_view hostname);
 
 // Returns the team number for a pi formated hostname.  pi-team#-pi#
-std::optional<uint16_t> ParsePiTeamNumber(const std::string &hostname);
+std::optional<uint16_t> ParsePiTeamNumber(const std::string_view hostname);
 
 }  // namespace team_number_internal
 }  // namespace network