Remove random unneeded <string> and StringStl.h includes.

Or document why is it still needed.
mosra · Dec 31, 2022 · c5fbb8a · c5fbb8a
1 parent e19373e
commit c5fbb8a
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 28 deletions.
diff --git a/doc/snippets/MagnumVk.cpp b/doc/snippets/MagnumVk.cpp
@@ -23,7 +23,6 @@
     DEALINGS IN THE SOFTWARE.
 */
 
-#include <string>
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/Containers/StringIterable.h>

diff --git a/src/Magnum/GL/Test/ContextGLTest.cpp b/src/Magnum/GL/Test/ContextGLTest.cpp
@@ -27,7 +27,7 @@
 #include <sstream>
 #include <Corrade/Containers/ScopeGuard.h>
 #include <Corrade/Containers/StringIterable.h>
-#include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/StringStl.h> /* contains() on std::string */
 #include <Corrade/Containers/StringView.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>
 

diff --git a/src/Magnum/Platform/WindowlessEglApplication.cpp b/src/Magnum/Platform/WindowlessEglApplication.cpp
@@ -27,8 +27,7 @@
 
 #include "WindowlessEglApplication.h"
 
-#include <cstring> /** @todo used by extensionSupported(), cleann up */
-#include <string>
+#include <cstring> /** @todo used by extensionSupported(), clean up */
 #include <Corrade/Utility/Arguments.h>
 #include <Corrade/Utility/Assert.h>
 #include <Corrade/Utility/Debug.h>

diff --git a/src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp b/src/Magnum/TextureTools/Test/DistanceFieldGLTest.cpp
@@ -24,7 +24,6 @@
 */
 
 #include <Corrade/Containers/String.h>
-#include <Corrade/Containers/StringStl.h> /** @todo remove when AbstractImporter is <string>-free */
 #include <Corrade/PluginManager/AbstractManager.h>
 #include <Corrade/Utility/Path.h>
 

diff --git a/src/Magnum/Trade/AbstractImageConverter.cpp b/src/Magnum/Trade/AbstractImageConverter.cpp
@@ -29,7 +29,6 @@
 #include <Corrade/Containers/EnumSet.hpp>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/Containers/StringView.h>
-#include <Corrade/Containers/StringStl.h> /** @todo remove once PluginManager is <string>-free */
 #include <Corrade/PluginManager/Manager.hpp>
 #include <Corrade/Utility/Assert.h>
 #include <Corrade/Utility/Path.h>

diff --git a/src/Magnum/Trade/Test/MaterialDataTest.cpp b/src/Magnum/Trade/Test/MaterialDataTest.cpp
@@ -26,7 +26,7 @@
 #include <algorithm> /* std::next_permutation() */
 #include <sstream>
 #include <Corrade/Containers/StaticArray.h>
-#include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/StringStl.h> /* partition() on a std::string */
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Container.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>

diff --git a/src/Magnum/Trade/Test/PbrClearCoatMaterialDataTest.cpp b/src/Magnum/Trade/Test/PbrClearCoatMaterialDataTest.cpp
@@ -24,7 +24,7 @@
 */
 
 #include <sstream>
-#include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/String.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 

diff --git a/src/Magnum/Trade/Test/PbrMetallicRoughnessMaterialDataTest.cpp b/src/Magnum/Trade/Test/PbrMetallicRoughnessMaterialDataTest.cpp
@@ -24,7 +24,7 @@
 */
 
 #include <sstream>
-#include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/String.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 

diff --git a/src/Magnum/Trade/Test/PbrSpecularGlossinessMaterialDataTest.cpp b/src/Magnum/Trade/Test/PbrSpecularGlossinessMaterialDataTest.cpp
@@ -24,7 +24,7 @@
 */
 
 #include <sstream>
-#include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/String.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 

diff --git a/src/Magnum/Trade/Test/PhongMaterialDataTest.cpp b/src/Magnum/Trade/Test/PhongMaterialDataTest.cpp
@@ -24,7 +24,7 @@
 */
 
 #include <sstream>
-#include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/String.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/Utility/DebugStl.h>
 

diff --git a/src/Magnum/Vk/Test/DevicePropertiesVkTest.cpp b/src/Magnum/Vk/Test/DevicePropertiesVkTest.cpp
@@ -26,7 +26,6 @@
 #include <sstream>
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/Optional.h>
-#include <Corrade/Containers/StringStl.h>
 #include <Corrade/Containers/StringIterable.h>
 #include <Corrade/Containers/StringView.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>

diff --git a/src/Magnum/Vk/Test/DeviceVkTest.cpp b/src/Magnum/Vk/Test/DeviceVkTest.cpp
@@ -27,8 +27,9 @@
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/Containers/StringIterable.h>
-#include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/StringStl.h> /* StringHasPrefix */
 #include <Corrade/TestSuite/Compare/Numeric.h>
+#include <Corrade/TestSuite/Compare/String.h>
 #include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/FormatStl.h>
 
@@ -785,11 +786,14 @@ void DeviceVkTest::constructExtensionsCommandLineDisable() {
     UnsignedInt major = versionMajor(deviceProperties.version());
     UnsignedInt minor = versionMinor(deviceProperties.version());
     UnsignedInt patch = versionPatch(deviceProperties.version());
-    /* SwiftShader reports just 1.1 with no patch version, special-case that */
-    std::string expected = Utility::formatString(data.log, deviceProperties.name(), major, minor, patch ? Utility::formatString(".{}", patch) : "", deviceProperties.driverName(), deviceProperties.driverInfo());
     /* The output might contain a device workaround list, cut that away.
        That's tested thoroughly in constructWorkaroundsCommandLineDisable(). */
-    CORRADE_COMPARE(out.str().substr(0, expected.size()), expected);
+    CORRADE_COMPARE_AS(out.str(),
+        Utility::format(data.log, deviceProperties.name(), major, minor,
+        /* SwiftShader reports just 1.1 with no patch version, special-case
+           that */
+        patch ? Utility::format(".{}", patch) : "", deviceProperties.driverName(), deviceProperties.driverInfo()),
+        TestSuite::Compare::StringHasPrefix);
 
     /* Verify that the entrypoint is actually (not) loaded as expected, to
        avoid all the above reporting being just smoke & mirrors */
@@ -842,11 +846,14 @@ void DeviceVkTest::constructExtensionsCommandLineEnable() {
     UnsignedInt major = versionMajor(deviceProperties.version());
     UnsignedInt minor = versionMinor(deviceProperties.version());
     UnsignedInt patch = versionPatch(deviceProperties.version());
-    /* SwiftShader reports just 1.1 with no patch version, special-case that */
-    std::string expected = Utility::formatString(data.log, deviceProperties.name(), major, minor, patch ? Utility::formatString(".{}", patch) : "", deviceProperties.driverName(), deviceProperties.driverInfo());
     /* The output might contain a device workaround list, cut that away.
        That's tested thoroughly in constructWorkaroundsCommandLineDisable(). */
-    CORRADE_COMPARE(out.str().substr(0, expected.size()), expected);
+    CORRADE_COMPARE_AS(out.str(),
+        Utility::format(data.log, deviceProperties.name(), major, minor,
+        /* SwiftShader reports just 1.1 with no patch version, special-case
+           that */
+        patch ? Utility::format(".{}", patch) : "", deviceProperties.driverName(), deviceProperties.driverInfo()),
+        TestSuite::Compare::StringHasPrefix);
 
     /* Verify that the entrypoint is actually (not) loaded as expected, to
        avoid all the above reporting being just smoke & mirrors */

diff --git a/src/Magnum/Vk/Test/ExtensionPropertiesVkTest.cpp b/src/Magnum/Vk/Test/ExtensionPropertiesVkTest.cpp
@@ -25,7 +25,6 @@
 
 #include <sstream>
 #include <Corrade/Containers/StringIterable.h>
-#include <Corrade/Containers/StringStl.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>
 #include <Corrade/Utility/DebugStl.h>
@@ -169,8 +168,7 @@ void ExtensionPropertiesVkTest::instanceExtensionIsSupported() {
     CORRADE_VERIFY(!properties.isSupported("ZZZZZ"));
 
     /* Verify that we're not just comparing a prefix */
-    const std::string extension = std::string(properties.name(0)) + "_hello";
-    CORRADE_VERIFY(!properties.isSupported(extension));
+    CORRADE_VERIFY(!properties.isSupported(properties.name(0) + "_hello"_s));
 
     /* This extension should be available almost always */
     if(!properties.isSupported("VK_KHR_get_physical_device_properties2"))

diff --git a/src/Magnum/Vk/Test/InstanceVkTest.cpp b/src/Magnum/Vk/Test/InstanceVkTest.cpp
@@ -26,7 +26,7 @@
 #include <sstream>
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/StringIterable.h>
-#include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/String.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>
 #include <Corrade/Utility/DebugStl.h>
@@ -432,7 +432,7 @@ void InstanceVkTest::constructCommandLineEnable() {
     UnsignedInt minor = versionMinor(enumerateInstanceVersion());
     UnsignedInt patch = versionPatch(enumerateInstanceVersion());
     /* Vulkan 1.0 instances report no patch version, special-case that */
-    CORRADE_COMPARE(out.str(), Utility::formatString(data.log, major, minor, patch ? Utility::formatString(".{}", patch) : ""));
+    CORRADE_COMPARE(out.str(), Utility::formatString(data.log, major, minor, patch ? Utility::format(".{}", patch) : ""));
 
     /* Verify that the entrypoint is actually (not) loaded as expected, to
        avoid all the above reporting being just smoke & mirrors */

diff --git a/src/Magnum/Vk/Test/LayerPropertiesVkTest.cpp b/src/Magnum/Vk/Test/LayerPropertiesVkTest.cpp
@@ -24,7 +24,6 @@
 */
 
 #include <sstream>
-#include <Corrade/Containers/StringStl.h>
 #include <Corrade/TestSuite/Tester.h>
 #include <Corrade/TestSuite/Compare/Numeric.h>
 #include <Corrade/Utility/DebugStl.h>
@@ -136,8 +135,7 @@ void LayerPropertiesVkTest::isSupported() {
     }
 
     /* Verify that we're not just comparing a prefix */
-    const std::string layer = std::string(properties.name(0)) + "_hello";
-    CORRADE_VERIFY(!properties.isSupported(layer));
+    CORRADE_VERIFY(!properties.isSupported(properties.name(0) + "_hello"_s));
 }
 
 }}}}

diff --git a/src/Magnum/Vk/VulkanTester.cpp b/src/Magnum/Vk/VulkanTester.cpp
@@ -25,7 +25,6 @@
 
 #include "VulkanTester.h"
 
-#include <string> /* sigh, for setSkippedArgumentPrefixes() */
 #include <Corrade/Containers/StringView.h>
 
 #include "Magnum/Vk/DeviceCreateInfo.h"