leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace fmt::error_code to std::error_code

Browse Source
This commit is contained in:
Владислав Щапов
2021-05-09 18:49:45 +05:00
committed by Victor Zverovich
parent 2165bef4ca
commit 2a9b314627
5 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/gtest-extra-test.cc
View File

@@ -311,7 +311,6 @@ TEST(gtest_extra_test, expect_system_error_streaming) {
#if FMT_USE_FCNTL
using fmt::buffered_file;
using fmt::error_code;
using fmt::file;
TEST(output_redirect_test, scoped_redirect) {

14
test/os-test.cc
View File

@@ -19,7 +19,6 @@
#endif
using fmt::buffered_file;
using fmt::error_code;
using testing::HasSubstr;
#ifdef _WIN32
@@ -69,11 +68,6 @@ TEST(util_test, utf16_to_utf8_convert) {
u.convert(fmt::wstring_view(L"foo", INT_MAX + 1u)));
}
TEST(os_test, error_code) {
EXPECT_EQ(error_code().get(), 0);
EXPECT_EQ(error_code(42).get(), 42);
}
TEST(os_test, format_std_error_code) {
EXPECT_EQ("generic:42",
fmt::format(FMT_STRING("{0}"),
@@ -527,18 +521,18 @@ TEST(file_test, dup2_error) {
TEST(file_test, dup2_noexcept) {
file f = open_file();
file copy = open_file();
error_code ec;
std::error_code ec;
f.dup2(copy.descriptor(), ec);
EXPECT_EQ(ec.get(), 0);
EXPECT_EQ(ec.value(), 0);
EXPECT_NE(f.descriptor(), copy.descriptor());
EXPECT_READ(copy, file_content);
}
TEST(file_test, dup2_noexcept_error) {
file f = open_file();
error_code ec;
std::error_code ec;
SUPPRESS_ASSERT(f.dup2(-1, ec));
EXPECT_EQ(EBADF, ec.get());
EXPECT_EQ(EBADF, ec.value());
}
TEST(file_test, pipe) {

5
test/posix-mock-test.cc
View File

@@ -30,7 +30,6 @@
#include "util.h"
using fmt::buffered_file;
using fmt::error_code;
using testing::_;
using testing::Return;
@@ -367,13 +366,13 @@ TEST(file_test, dup2_retry) {
TEST(file_test, dup2_no_except_retry) {
int stdout_fd = FMT_POSIX(fileno(stdout));
file f1 = file::dup(stdout_fd), f2 = file::dup(stdout_fd);
error_code ec;
std::error_code ec;
dup2_count = 1;
f1.dup2(f2.descriptor(), ec);
# ifndef _WIN32
EXPECT_EQ(4, dup2_count);
# else
EXPECT_EQ(EINTR, ec.get());
EXPECT_EQ(EINTR, ec.value());
# endif
dup2_count = 0;
}