From b6fb9fed7f9d94f46f7166cb2a4976fcc0af2c13 Mon Sep 17 00:00:00 2001
From: Ken Matsui <26405363+ken-matsui@users.noreply.github.com>
Date: Thu, 30 Jan 2025 23:16:09 -0500
Subject: [PATCH] some tweaks

---
 src/BuildConfig.cc | 2 ++
 src/Cmd/Add.cc     | 2 ++
 src/Cmd/Test.cc    | 2 ++
 src/Manifest.cc    | 4 ++--
 src/Manifest.hpp   | 1 -
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/BuildConfig.cc b/src/BuildConfig.cc
index b5cd9bb92..464f3a882 100644
--- a/src/BuildConfig.cc
+++ b/src/BuildConfig.cc
@@ -60,6 +60,8 @@ operator<<(std::ostream& os, VarType type) {
 
 Result<BuildConfig>
 BuildConfig::init(const Manifest& manifest, const bool isDebug) {
+  using std::string_view_literals::operator""sv;
+
   std::string libName;
   if (manifest.package.name.starts_with("lib")) {
     libName = fmt::format("{}.a", manifest.package.name);
diff --git a/src/Cmd/Add.cc b/src/Cmd/Add.cc
index 899b6d640..1b846a273 100644
--- a/src/Cmd/Add.cc
+++ b/src/Cmd/Add.cc
@@ -81,6 +81,8 @@ getDependencyGitUrl(const std::string_view dep) {
 
 static std::string
 getDependencyName(const std::string_view dep) {
+  using std::string_view_literals::operator""sv;
+
   std::string name;
   if (dep.find("://") == std::string_view::npos) {
     name = dep.substr(dep.find_last_of('/') + 1);
diff --git a/src/Cmd/Test.cc b/src/Cmd/Test.cc
index 2c56c18a0..ff9f2ae40 100644
--- a/src/Cmd/Test.cc
+++ b/src/Cmd/Test.cc
@@ -164,6 +164,8 @@ Test::compileTestTargets() {
 
 Result<void>
 Test::runTestTargets() {
+  using std::string_view_literals::operator""sv;
+
   const auto start = std::chrono::steady_clock::now();
 
   std::size_t numPassed = 0;
diff --git a/src/Manifest.cc b/src/Manifest.cc
index 31986a48e..8d6653eda 100644
--- a/src/Manifest.cc
+++ b/src/Manifest.cc
@@ -224,8 +224,8 @@ static Result<std::unordered_map<std::string, Profile>>
 parseProfiles(const toml::value& val) noexcept {
   std::unordered_map<std::string, Profile> profiles;
   const BaseProfile baseProfile = Try(parseBaseProfile(val));
-  profiles.insert({ "dev", Try(parseDevProfile(val, baseProfile)) });
-  profiles.insert({ "release", Try(parseReleaseProfile(val, baseProfile)) });
+  profiles.emplace("dev", Try(parseDevProfile(val, baseProfile)));
+  profiles.emplace("release", Try(parseReleaseProfile(val, baseProfile)));
   return Ok(profiles);
 }
 
diff --git a/src/Manifest.hpp b/src/Manifest.hpp
index b3dc06ced..1bd64800d 100644
--- a/src/Manifest.hpp
+++ b/src/Manifest.hpp
@@ -21,7 +21,6 @@
 namespace cabin {
 
 namespace fs = std::filesystem;
-using std::string_view_literals::operator""sv;
 
 struct Edition {
   enum class Year : uint16_t {