Skip to content

Fix failures when parsing the default options for binary caching not being emitted. #14945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 3 commits into from
Dec 4, 2020
Merged

Fix failures when parsing the default options for binary caching not being emitted. #14945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1729a2
Fix failures when parsing the default options for binary caching not …
BillyONeal Dec 4, 2020
da6b4b4
format
BillyONeal Dec 4, 2020
68a39a4
Merge remote-tracking branch 'origin/master' into report_default_errors
BillyONeal Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions toolsrc/include/vcpkg/base/parse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ namespace vcpkg::Parse
{
virtual ~IParseError() = default;
virtual std::string format() const = 0;
virtual const std::string& get_message() const = 0;
};

struct ParseError : IParseError
Expand All @@ -38,6 +39,7 @@ namespace vcpkg::Parse
const std::string message;

virtual std::string format() const override;
virtual const std::string& get_message() const override;
};

struct ParserBase
Expand Down
2 changes: 2 additions & 0 deletions toolsrc/src/vcpkg/base/parse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ namespace vcpkg::Parse
"^\n");
}

const std::string& ParseError::get_message() const { return this->message; }

ParserBase::ParserBase(StringView text, StringView origin, TextRowCol init_rowcol)
: m_it(text.begin(), text.end())
, m_start_of_line(m_it)
Expand Down
1 change: 1 addition & 0 deletions toolsrc/src/vcpkg/binarycaching.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,7 @@ ExpectedS<std::unique_ptr<IBinaryProvider>> vcpkg::create_binary_provider_from_c

BinaryConfigParser default_parser("default,readwrite", "<defaults>", &s);
default_parser.parse();
if (auto err = default_parser.get_error()) return err->get_message();

BinaryConfigParser env_parser(env_string, "VCPKG_BINARY_SOURCES", &s);
env_parser.parse();
Expand Down
13 changes: 7 additions & 6 deletions toolsrc/src/vcpkg/versiondeserializers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
using namespace vcpkg;
using namespace vcpkg::Versions;

static constexpr StringLiteral VERSION_RELAXED = "version";
static constexpr StringLiteral VERSION_SEMVER = "version-semver";
static constexpr StringLiteral VERSION_STRING = "version-string";
static constexpr StringLiteral VERSION_DATE = "version-date";
static constexpr StringLiteral PORT_VERSION = "port-version";

namespace
{
constexpr StringLiteral VERSION_RELAXED = "version";
constexpr StringLiteral VERSION_SEMVER = "version-semver";
constexpr StringLiteral VERSION_STRING = "version-string";
constexpr StringLiteral VERSION_DATE = "version-date";
constexpr StringLiteral PORT_VERSION = "port-version";
constexpr StringLiteral GIT_TREE = "git-tree";

struct VersionDeserializer final : Json::IDeserializer<std::string>
{
VersionDeserializer(StringLiteral type) : m_type(type) { }
Expand Down