3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Inline SourceLineInfo::empty definition

This commit is contained in:
Martin Hořeňovský 2019-09-08 18:20:49 +02:00
parent e2b3443fe7
commit 293012a002
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/deprecations.md
View File

@ -39,6 +39,11 @@ apart from writing it out for `--list-tests -v high`.
Because it isn't actually used nor documented, and brings complications Because it isn't actually used nor documented, and brings complications
to Catch2's internals, description support will be removed. to Catch2's internals, description support will be removed.
### SourceLineInfo::empty()
There should be no reason to ever have an empty `SourceLineInfo`, so the
method will be removed.
## Planned changes ## Planned changes

3
include/internal/catch_common.cpp
View File

@ -15,9 +15,6 @@
namespace Catch { namespace Catch {
bool SourceLineInfo::empty() const noexcept {
return file[0] == '\0';
}
bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept { bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0); return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
} }

2
include/internal/catch_common.h
View File

@ -57,7 +57,7 @@ namespace Catch {
SourceLineInfo( SourceLineInfo&& ) noexcept = default; SourceLineInfo( SourceLineInfo&& ) noexcept = default;
SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default; SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
bool empty() const noexcept; bool empty() const noexcept { return file[0] == '\0'; }
bool operator == ( SourceLineInfo const& other ) const noexcept; bool operator == ( SourceLineInfo const& other ) const noexcept;
bool operator < ( SourceLineInfo const& other ) const noexcept; bool operator < ( SourceLineInfo const& other ) const noexcept;

9
include/reporters/catch_reporter_console.cpp
View File

@ -530,11 +530,10 @@ void ConsoleReporter::printTestCaseAndSectionHeader() {
SourceLineInfo lineInfo = m_sectionStack.back().lineInfo; SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
if (!lineInfo.empty()) {
stream << getLineOfChars<'-'>() << '\n'; stream << getLineOfChars<'-'>() << '\n';
Colour colourGuard(Colour::FileName); Colour colourGuard(Colour::FileName);
stream << lineInfo << '\n'; stream << lineInfo << '\n';
}
stream << getLineOfChars<'.'>() << '\n' << std::endl; stream << getLineOfChars<'.'>() << '\n' << std::endl;
} }

3
include/reporters/catch_reporter_teamcity.hpp
View File

@ -183,8 +183,7 @@ namespace Catch {
SourceLineInfo lineInfo = m_sectionStack.front().lineInfo; SourceLineInfo lineInfo = m_sectionStack.front().lineInfo;
if( !lineInfo.empty() ) os << lineInfo << "\n";
os << lineInfo << "\n";
os << getLineOfChars<'.'>() << "\n\n"; os << getLineOfChars<'.'>() << "\n\n";
} }