[FarGroup/FarManager] master: Refactoring (631a97ffe)

[farg...@farmanager.com]

Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/631a97ffe6dd681f4691eed1233122a4e6d43513

>---------------------------------------------------------------

commit 631a97ffe6dd681f4691eed1233122a4e6d43513
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Tue Jun 16 22:10:46 2026 +0100

Refactoring


>---------------------------------------------------------------

631a97ffe6dd681f4691eed1233122a4e6d43513
far/common/scope_exit.hpp | 3 +--
far/datetime.cpp | 4 ++--
far/encoding.cpp | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/far/common/scope_exit.hpp b/far/common/scope_exit.hpp
index b34626259..e30415df7 100644
--- a/far/common/scope_exit.hpp
+++ b/far/common/scope_exit.hpp
@@ -35,7 +35,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "preprocessor.hpp"

#include <exception>
-#include <stdexcept>

//----------------------------------------------------------------------------

@@ -91,7 +90,7 @@ namespace scope_exit
public:
template<typename F>
[[nodiscard]]
- auto operator<<(F&& f) { return scope_guard<Type, F>(FWD(f)); }
+ auto operator<<(F&& f) const { return scope_guard<Type, F>(FWD(f)); }
};
}

diff --git a/far/datetime.cpp b/far/datetime.cpp
index df338867d..051b12e41 100644
--- a/far/datetime.cpp
+++ b/far/datetime.cpp
@@ -426,7 +426,7 @@ namespace
// 0123456789012345
// ^ ^ ^ ^
// 12 12 12 1234567
-static constexpr time_ranges TimeRanges{ { {0, 2}, { 3, 2 }, { 6, 2 }, { 9, 7 } } };
+static constexpr time_ranges TimeRanges{{ { 0, 2 }, { 3, 2 }, { 6, 2 }, { 9, 7 } }};

static date_ranges get_date_ranges(date_type const DateFormat)
{
@@ -438,7 +438,7 @@ static date_ranges get_date_ranges(date_type const DateFormat)
// 01234567890
// ^ ^ ^
// 12345 12 12
- return { { { 0, 5 }, { 6, 2 }, { 9, 2 } } };
+ return {{ { 0, 5 }, { 6, 2 }, { 9, 2 } }};

case date_type::dmy:
case date_type::mdy:
diff --git a/far/encoding.cpp b/far/encoding.cpp
index 929563cdb..efa1f0f85 100644
--- a/far/encoding.cpp
+++ b/far/encoding.cpp
@@ -1871,8 +1871,8 @@ TEST_CASE("encoding.raw_eol")
}
Tests[]
{
- {CP_ACP, '\r', '\n' },
- {CP_OEMCP, '\r', '\n' },
+ {1252, '\r', '\n' },
+ {850, '\r', '\n' },
{37, '\r', '%' },
{500, '\r', '%' },
};