build: Support fmt 11 (#3368)

* build: Support fmt 11

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>

* fixup! build: Support fmt 11

Required for Windows.

See: https://github.com/mamba-org/mamba/actions/runs/10144210776/job/28047211432?pr=3368#step:8:955

---------

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
This commit is contained in:
Julien Jerphanion 2024-07-29 16:28:56 +02:00 committed by GitHub
parent b09f1d162f
commit 4fbd22a9c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
25 changed files with 43 additions and 27 deletions

View File

@ -8,6 +8,7 @@
#define MAMBA_DOWNLOAD_MIRROR_HPP #define MAMBA_DOWNLOAD_MIRROR_HPP
#include <functional> #include <functional>
#include <memory>
#include <mutex> #include <mutex>
#include <optional> #include <optional>
#include <string> #include <string>

View File

@ -1371,7 +1371,7 @@ struct fmt::formatter<::mamba::fs::u8path>
} }
template <class FormatContext> template <class FormatContext>
auto format(const ::mamba::fs::u8path& path, FormatContext& ctx) auto format(const ::mamba::fs::u8path& path, FormatContext& ctx) const
{ {
return fmt::format_to(ctx.out(), "'{}'", path.string()); return fmt::format_to(ctx.out(), "'{}'", path.string());
} }

View File

@ -154,7 +154,7 @@ struct fmt::formatter<mamba::specs::BuildNumberPredicate>
{ {
auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); auto parse(format_parse_context& ctx) -> decltype(ctx.begin());
auto format(const ::mamba::specs::BuildNumberPredicate& pred, format_context& ctx) auto format(const ::mamba::specs::BuildNumberPredicate& pred, format_context& ctx) const
-> decltype(ctx.out()); -> decltype(ctx.out());
}; };
@ -163,8 +163,8 @@ struct fmt::formatter<mamba::specs::BuildNumberSpec>
{ {
auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); auto parse(format_parse_context& ctx) -> decltype(ctx.begin());
auto auto format(const ::mamba::specs::BuildNumberSpec& spec, format_context& ctx) const
format(const ::mamba::specs::BuildNumberSpec& spec, format_context& ctx) -> decltype(ctx.out()); -> decltype(ctx.out());
}; };
template <> template <>

View File

@ -74,8 +74,8 @@ struct fmt::formatter<mamba::specs::ChimeraStringSpec>
{ {
auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); auto parse(format_parse_context& ctx) -> decltype(ctx.begin());
auto auto format(const ::mamba::specs::ChimeraStringSpec& spec, format_context& ctx) const
format(const ::mamba::specs::ChimeraStringSpec& spec, format_context& ctx) -> decltype(ctx.out()); -> decltype(ctx.out());
}; };
template <> template <>

View File

@ -65,7 +65,8 @@ struct fmt::formatter<mamba::specs::GlobSpec>
{ {
auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); auto parse(format_parse_context& ctx) -> decltype(ctx.begin());
auto format(const ::mamba::specs::GlobSpec& spec, format_context& ctx) -> decltype(ctx.out()); auto
format(const ::mamba::specs::GlobSpec& spec, format_context& ctx) const -> decltype(ctx.out());
}; };
template <> template <>

View File

@ -229,7 +229,8 @@ struct fmt::formatter<::mamba::specs::MatchSpec>
{ {
auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); auto parse(format_parse_context& ctx) -> decltype(ctx.begin());
auto format(const ::mamba::specs::MatchSpec& spec, format_context& ctx) -> decltype(ctx.out()); auto
format(const ::mamba::specs::MatchSpec& spec, format_context& ctx) const -> decltype(ctx.out());
}; };
/********************************* /*********************************

View File

@ -71,7 +71,8 @@ struct fmt::formatter<mamba::specs::RegexSpec>
{ {
auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); auto parse(format_parse_context& ctx) -> decltype(ctx.begin());
auto format(const ::mamba::specs::RegexSpec& spec, format_context& ctx) -> decltype(ctx.out()); auto
format(const ::mamba::specs::RegexSpec& spec, format_context& ctx) const -> decltype(ctx.out());
}; };
#endif #endif

View File

@ -177,8 +177,8 @@ struct fmt::formatter<mamba::specs::VersionPartAtom>
{ {
auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); auto parse(format_parse_context& ctx) -> decltype(ctx.begin());
auto auto format(const ::mamba::specs::VersionPartAtom atom, format_context& ctx) const
format(const ::mamba::specs::VersionPartAtom atom, format_context& ctx) -> decltype(ctx.out()); -> decltype(ctx.out());
}; };
template <> template <>
@ -188,7 +188,7 @@ struct fmt::formatter<mamba::specs::Version>
auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); auto parse(format_parse_context& ctx) -> decltype(ctx.begin());
auto format(const ::mamba::specs::Version v, format_context& ctx) -> decltype(ctx.out()); auto format(const ::mamba::specs::Version v, format_context& ctx) const -> decltype(ctx.out());
}; };
#endif #endif

View File

@ -229,8 +229,8 @@ struct fmt::formatter<mamba::specs::VersionPredicate>
auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); auto parse(format_parse_context& ctx) -> decltype(ctx.begin());
auto auto format(const ::mamba::specs::VersionPredicate& pred, format_context& ctx) const
format(const ::mamba::specs::VersionPredicate& pred, format_context& ctx) -> decltype(ctx.out()); -> decltype(ctx.out());
}; };
template <> template <>
@ -243,7 +243,8 @@ struct fmt::formatter<mamba::specs::VersionSpec>
auto parse(format_parse_context& ctx) -> decltype(ctx.begin()); auto parse(format_parse_context& ctx) -> decltype(ctx.begin());
auto format(const ::mamba::specs::VersionSpec& spec, format_context& ctx) -> decltype(ctx.out()); auto
format(const ::mamba::specs::VersionSpec& spec, format_context& ctx) const -> decltype(ctx.out());
}; };
template <> template <>

View File

@ -9,6 +9,7 @@
#include <fmt/color.h> #include <fmt/color.h>
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <fmt/ranges.h>
#include <reproc++/run.hpp> #include <reproc++/run.hpp>
#include <reproc/reproc.h> #include <reproc/reproc.h>

View File

@ -6,8 +6,8 @@
#include <iostream> #include <iostream>
#include <fmt/format.h>
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <fmt/ranges.h>
#include <spdlog/pattern_formatter.h> #include <spdlog/pattern_formatter.h>
#include <spdlog/sinks/stdout_color_sinks.h> #include <spdlog/sinks/stdout_color_sinks.h>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>

View File

@ -14,6 +14,7 @@
#include <fmt/color.h> #include <fmt/color.h>
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <fmt/ranges.h>
#include "mamba/core/context.hpp" #include "mamba/core/context.hpp"
#include "mamba/core/output.hpp" #include "mamba/core/output.hpp"

View File

@ -26,6 +26,7 @@ extern "C"
#include <fmt/color.h> #include <fmt/color.h>
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ostream.h> #include <fmt/ostream.h>
#include <fmt/ranges.h>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <reproc++/run.hpp> #include <reproc++/run.hpp>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>

View File

@ -8,6 +8,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <fmt/ranges.h>
#include <solv/problems.h> #include <solv/problems.h>
#include <solv/solver.h> #include <solv/solver.h>

View File

@ -113,7 +113,7 @@ auto
fmt::formatter<mamba::specs::BuildNumberPredicate>::format( fmt::formatter<mamba::specs::BuildNumberPredicate>::format(
const ::mamba::specs::BuildNumberPredicate& pred, const ::mamba::specs::BuildNumberPredicate& pred,
format_context& ctx format_context& ctx
) -> decltype(ctx.out()) ) const -> decltype(ctx.out())
{ {
using BuildNumberPredicate = typename mamba::specs::BuildNumberPredicate; using BuildNumberPredicate = typename mamba::specs::BuildNumberPredicate;
using BuildNumber = typename BuildNumberPredicate::BuildNumber; using BuildNumber = typename BuildNumberPredicate::BuildNumber;
@ -268,7 +268,7 @@ auto
fmt::formatter<mamba::specs::BuildNumberSpec>::format( fmt::formatter<mamba::specs::BuildNumberSpec>::format(
const ::mamba::specs::BuildNumberSpec& spec, const ::mamba::specs::BuildNumberSpec& spec,
format_context& ctx format_context& ctx
) -> decltype(ctx.out()) ) const -> decltype(ctx.out())
{ {
return fmt::format_to(ctx.out(), "{}", spec.m_predicate); return fmt::format_to(ctx.out(), "{}", spec.m_predicate);
} }

View File

@ -140,7 +140,7 @@ auto
fmt::formatter<mamba::specs::ChimeraStringSpec>::format( fmt::formatter<mamba::specs::ChimeraStringSpec>::format(
const ::mamba::specs::ChimeraStringSpec& spec, const ::mamba::specs::ChimeraStringSpec& spec,
format_context& ctx format_context& ctx
) -> decltype(ctx.out()) ) const -> decltype(ctx.out())
{ {
return fmt::format_to(ctx.out(), "{}", spec.str()); return fmt::format_to(ctx.out(), "{}", spec.str());
} }

View File

@ -56,8 +56,10 @@ fmt::formatter<mamba::specs::GlobSpec>::parse(format_parse_context& ctx) -> decl
} }
auto auto
fmt::formatter<mamba::specs::GlobSpec>::format(const ::mamba::specs::GlobSpec& spec, format_context& ctx) fmt::formatter<mamba::specs::GlobSpec>::format(
-> decltype(ctx.out()) const ::mamba::specs::GlobSpec& spec,
format_context& ctx
) const -> decltype(ctx.out())
{ {
return fmt::format_to(ctx.out(), "{}", spec.str()); return fmt::format_to(ctx.out(), "{}", spec.str());
} }

View File

@ -9,6 +9,7 @@
#include <tuple> #include <tuple>
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ranges.h>
#include "mamba/specs/archive.hpp" #include "mamba/specs/archive.hpp"
#include "mamba/specs/match_spec.hpp" #include "mamba/specs/match_spec.hpp"
@ -1069,7 +1070,7 @@ auto
fmt::formatter<::mamba::specs::MatchSpec>::format( fmt::formatter<::mamba::specs::MatchSpec>::format(
const ::mamba::specs::MatchSpec& spec, const ::mamba::specs::MatchSpec& spec,
format_context& ctx format_context& ctx
) -> decltype(ctx.out()) ) const -> decltype(ctx.out())
{ {
using MatchSpec = ::mamba::specs::MatchSpec; using MatchSpec = ::mamba::specs::MatchSpec;

View File

@ -11,6 +11,7 @@
#include <fmt/core.h> #include <fmt/core.h>
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ranges.h>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "mamba/specs/archive.hpp" #include "mamba/specs/archive.hpp"

View File

@ -102,7 +102,7 @@ auto
fmt::formatter<mamba::specs::RegexSpec>::format( fmt::formatter<mamba::specs::RegexSpec>::format(
const ::mamba::specs::RegexSpec& spec, const ::mamba::specs::RegexSpec& spec,
format_context& ctx format_context& ctx
) -> decltype(ctx.out()) ) const -> decltype(ctx.out())
{ {
return fmt::format_to(ctx.out(), "{}", spec.str()); return fmt::format_to(ctx.out(), "{}", spec.str());
} }

View File

@ -13,6 +13,7 @@
#include <utility> #include <utility>
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ranges.h>
#include "mamba/fs/filesystem.hpp" #include "mamba/fs/filesystem.hpp"
#include "mamba/specs/archive.hpp" #include "mamba/specs/archive.hpp"

View File

@ -191,7 +191,7 @@ auto
fmt::formatter<mamba::specs::VersionPartAtom>::format( fmt::formatter<mamba::specs::VersionPartAtom>::format(
const ::mamba::specs::VersionPartAtom atom, const ::mamba::specs::VersionPartAtom atom,
format_context& ctx format_context& ctx
) -> decltype(ctx.out()) ) const -> decltype(ctx.out())
{ {
return fmt::format_to(ctx.out(), "{}{}", atom.numeral(), atom.literal()); return fmt::format_to(ctx.out(), "{}{}", atom.numeral(), atom.literal());
} }
@ -792,7 +792,7 @@ fmt::formatter<mamba::specs::Version>::parse(format_parse_context& ctx) -> declt
auto auto
fmt::formatter<mamba::specs::Version>::format(const ::mamba::specs::Version v, format_context& ctx) fmt::formatter<mamba::specs::Version>::format(const ::mamba::specs::Version v, format_context& ctx)
-> decltype(ctx.out()) const -> decltype(ctx.out())
{ {
auto out = ctx.out(); auto out = ctx.out();
if (v.epoch() != 0) if (v.epoch() != 0)

View File

@ -195,7 +195,7 @@ auto
fmt::formatter<mamba::specs::VersionPredicate>::format( fmt::formatter<mamba::specs::VersionPredicate>::format(
const ::mamba::specs::VersionPredicate& pred, const ::mamba::specs::VersionPredicate& pred,
format_context& ctx format_context& ctx
) -> decltype(ctx.out()) ) const -> decltype(ctx.out())
{ {
using VersionPredicate = typename mamba::specs::VersionPredicate; using VersionPredicate = typename mamba::specs::VersionPredicate;
using VersionSpec = typename mamba::specs::VersionSpec; using VersionSpec = typename mamba::specs::VersionSpec;
@ -589,7 +589,7 @@ auto
fmt::formatter<mamba::specs::VersionSpec>::format( fmt::formatter<mamba::specs::VersionSpec>::format(
const ::mamba::specs::VersionSpec& spec, const ::mamba::specs::VersionSpec& spec,
format_context& ctx format_context& ctx
) -> decltype(ctx.out()) ) const -> decltype(ctx.out())
{ {
using VersionSpec = typename mamba::specs::VersionSpec; using VersionSpec = typename mamba::specs::VersionSpec;

View File

@ -10,6 +10,7 @@
#include <string> #include <string>
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ranges.h>
#include <reproc++/run.hpp> #include <reproc++/run.hpp>
#include "mamba/util/environment.hpp" #include "mamba/util/environment.hpp"

View File

@ -10,6 +10,7 @@
#include <fmt/color.h> #include <fmt/color.h>
#include <fmt/format.h> #include <fmt/format.h>
#include <fmt/ranges.h>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <reproc++/run.hpp> #include <reproc++/run.hpp>
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>