Remove last calls to vformat

disorderedmaterials · Jan 6, 2025 · 0094384 · 0094384
1 parent ccabac8
commit 0094384
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/src/base/lineParser.h b/src/base/lineParser.h
@@ -142,7 +142,7 @@ class LineParser
     // Write line to file
     bool writeLine(std::string_view s) const;
     // Write formatted line to file
-    template <typename... Args> bool writeLineF(std::string_view format, Args... args) const
+    template <typename... Args> bool writeLineF(std::format_string<Args...> format, Args... args) const
     {
         auto result = true;
 
@@ -171,9 +171,9 @@ class LineParser
 
             // Format the line and store it
             if (directOutput_)
-                (*outputFile_) << std::vformat(format, std::make_format_args(args...));
+                (*outputFile_) << std::format(format, std::forward<Args>(args)...);
             else
-                (*cachedFile_) << std::vformat(format, std::make_format_args(args...));
+                (*cachedFile_) << std::format(format, std::forward<Args>(args)...);
         }
 
         // Broadcast result of write
@@ -183,15 +183,15 @@ class LineParser
         return result;
     }
     // Print banner comment of fixed width
-    template <typename... Args> bool writeBannerComment(std::string_view format, Args... args)
+    template <typename... Args> bool writeBannerComment(std::format_string<Args...> format, Args... args)
     {
         const auto bannerWidth = 80;
         static std::string bannerBorder = std::format("#{0:=^{1}}#", "", bannerWidth - 2);
 
         // Finally, print the banner
         if (!writeLineF("\n{}\n", bannerBorder))
             return false;
-        if (!writeLineF("#{:^{}}#", std::vformat(format, std::make_format_args(args...)), bannerWidth - 2))
+        if (!writeLineF("#{:^{}}#", std::format(format, std::forward<Args>(args)...), bannerWidth - 2))
             return false;
         if (!writeLineF("\n{}\n", bannerBorder))
             return false;

diff --git a/src/base/sysFunc.h b/src/base/sysFunc.h
@@ -85,7 +85,7 @@ class DissolveSys
                                 return !nameFunction(object).empty() &&
                                        DissolveSys::sameString(nameFunction(object), uniqueName);
                             }) != objects.end())
-            uniqueName = std::vformat("{}{:02d}", std::make_format_args(base, ++suffix));
+            uniqueName = std::format("{}{:02d}", base, ++suffix);
 
         return uniqueName;
     }

diff --git a/src/classes/species_io.cpp b/src/classes/species_io.cpp
@@ -681,16 +681,15 @@ bool Species::write(LineParser &parser, std::string_view prefix)
             {
                 // Write new 1-4 scale factor line if this torsion has different values
                 if ((torsion.electrostatic14Scaling() != elec14Scaling || torsion.vanDerWaals14Scaling() != vdw14Scaling) &&
-                    !parser.writeLineF(std::format("{}{}  {}  {}\n", newPrefix,
-                                                   keywords().keyword(Species::SpeciesKeyword::Scaling14),
-                                                   torsion.electrostatic14Scaling(), torsion.vanDerWaals14Scaling())))
+                    !parser.writeLineF("{}{}  {}  {}\n", newPrefix, keywords().keyword(Species::SpeciesKeyword::Scaling14),
+                                       torsion.electrostatic14Scaling(), torsion.vanDerWaals14Scaling()))
                     return false;
 
-                if (!parser.writeLineF(std::format("{}{}  {:3d}  {:3d}  {:3d}  {:3d}  {}  {}\n", newPrefix,
-                                                   keywords().keyword(Species::SpeciesKeyword::Torsion), torsion.indexI() + 1,
-                                                   torsion.indexJ() + 1, torsion.indexK() + 1, torsion.indexL() + 1,
-                                                   TorsionFunctions::forms().keyword(torsion.interactionForm()),
-                                                   torsion.interactionPotential().parametersAsString())))
+                if (!parser.writeLineF("{}{}  {:3d}  {:3d}  {:3d}  {:3d}  {}  {}\n", newPrefix,
+                                       keywords().keyword(Species::SpeciesKeyword::Torsion), torsion.indexI() + 1,
+                                       torsion.indexJ() + 1, torsion.indexK() + 1, torsion.indexL() + 1,
+                                       TorsionFunctions::forms().keyword(torsion.interactionForm()),
+                                       torsion.interactionPotential().parametersAsString()))
                     return false;
 
                 elec14Scaling = torsion.electrostatic14Scaling();

diff --git a/src/main/io.cpp b/src/main/io.cpp
@@ -363,8 +363,8 @@ bool Dissolve::saveInput(std::string_view filename)
         {
             // Write new 1-4 scale factor line if this torsion has different values
             if ((t->electrostatic14Scaling() != elec14Scaling || t->vanDerWaals14Scaling() != vdw14Scaling) &&
-                !parser.writeLineF(std::format("  {}  {}  {}\n", MasterBlock::keywords().keyword(MasterBlock::Scaling14Keyword),
-                                               t->electrostatic14Scaling(), t->vanDerWaals14Scaling())))
+                !parser.writeLineF("  {}  {}  {}\n", MasterBlock::keywords().keyword(MasterBlock::Scaling14Keyword),
+                                   t->electrostatic14Scaling(), t->vanDerWaals14Scaling()))
                 return false;
 
             if (!parser.writeLineF("  {}  '{}'  {}  {}\n", MasterBlock::keywords().keyword(MasterBlock::TorsionKeyword),