Merge pull request #1511 from GuillaumeGomez/cleanup-profile-conversions

Clean up code conversions of Profile enum
rust-lang · Jan 19, 2023 · 3af3ba1 · 3af3ba1
2 parents 2f13590 + 24d06c9
commit 3af3ba1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 30 deletions.
diff --git a/database/src/bin/ingest-json.rs b/database/src/bin/ingest-json.rs
@@ -921,12 +921,7 @@ async fn ingest<T: Ingesting>(conn: &T, caches: &mut IdCache, path: &Path) {
             } else {
                 Profile::Debug
             };
-            let profile_str = match profile {
-                Profile::Check => "check",
-                Profile::Debug => "debug",
-                Profile::Doc => "doc",
-                Profile::Opt => "opt",
-            };
+            let profile_str = profile.as_str();
             let state = match &run.state {
                 BenchmarkState::Clean => Scenario::Empty,
                 BenchmarkState::IncrementalStart => Scenario::IncrementalEmpty,

diff --git a/database/src/lib.rs b/database/src/lib.rs
@@ -226,6 +226,17 @@ pub enum Profile {
     Opt,
 }
 
+impl Profile {
+    pub fn as_str(self) -> &'static str {
+        match self {
+            Profile::Check => "check",
+            Profile::Opt => "opt",
+            Profile::Debug => "debug",
+            Profile::Doc => "doc",
+        }
+    }
+}
+
 impl std::str::FromStr for Profile {
     type Err = String;
     fn from_str(s: &str) -> Result<Self, Self::Err> {
@@ -241,16 +252,7 @@ impl std::str::FromStr for Profile {
 
 impl fmt::Display for Profile {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Profile::Check => "check",
-                Profile::Opt => "opt",
-                Profile::Debug => "debug",
-                Profile::Doc => "doc",
-            }
-        )
+        write!(f, "{}", self.as_str())
     }
 }
 

diff --git a/database/src/pool/postgres.rs b/database/src/pool/postgres.rs
@@ -546,13 +546,7 @@ where
                         row.get::<_, i32>(0) as u32,
                         (
                             Benchmark::from(row.get::<_, String>(1).as_str()),
-                            match row.get::<_, String>(2).as_str() {
-                                "check" => Profile::Check,
-                                "opt" => Profile::Opt,
-                                "debug" => Profile::Debug,
-                                "doc" => Profile::Doc,
-                                o => unreachable!("{}: not a profile", o),
-                            },
+                            Profile::from_str(row.get::<_, String>(2).as_str()).unwrap(),
                             row.get::<_, String>(3).as_str().parse().unwrap(),
                             row.get::<_, String>(4).as_str().into(),
                         ),

diff --git a/database/src/pool/sqlite.rs b/database/src/pool/sqlite.rs
@@ -468,13 +468,7 @@ impl Connection for SqliteConnection {
                         row.get::<_, i32>(0)? as u32,
                         (
                             Benchmark::from(row.get::<_, String>(1)?.as_str()),
-                            match row.get::<_, String>(2)?.as_str() {
-                                "check" => Profile::Check,
-                                "opt" => Profile::Opt,
-                                "debug" => Profile::Debug,
-                                "doc" => Profile::Doc,
-                                o => unreachable!("{}: not a profile", o),
-                            },
+                            Profile::from_str(row.get::<_, String>(2)?.as_str()).unwrap(),
                             row.get::<_, String>(3)?.as_str().parse().unwrap(),
                             row.get::<_, String>(4)?.as_str().into(),
                         ),