diff --git a/src/gn/rust_project_writer.cc b/src/gn/rust_project_writer.cc
index 3324e3a..181d50f 100644
--- a/src/gn/rust_project_writer.cc
+++ b/src/gn/rust_project_writer.cc
@@ -172,8 +172,7 @@
   }
 
   auto compiler_args = ExtractCompilerArgs(target);
-  auto compiler_target =
-      FindArgValueAfterPrefix(std::string("--target="), compiler_args);
+  auto compiler_target = FindArgValueAfterPrefix("--target=", compiler_args);
   if (!compiler_target.has_value()) {
     compiler_target = FindArgValue("--target", compiler_args);
   }
@@ -193,8 +192,7 @@
   SourceFile crate_root = target->rust_values().crate_root();
   std::string crate_label = target->label().GetUserVisibleName(false);
 
-  auto edition =
-      FindArgValueAfterPrefix(std::string("--edition="), compiler_args);
+  auto edition = FindArgValueAfterPrefix("--edition=", compiler_args);
   if (!edition.has_value()) {
     edition = FindArgValue("--edition", compiler_args);
   }
@@ -232,8 +230,7 @@
   if (compiler_target.has_value())
     crate.SetCompilerTarget(compiler_target.value());
 
-  ConfigList cfgs =
-      FindAllArgValuesAfterPrefix(std::string("--cfg="), compiler_args);
+  ConfigList cfgs = FindAllArgValuesAfterPrefix("--cfg=", compiler_args);
 
   crate.AddConfigItem("test");
   crate.AddConfigItem("debug_assertions");
