Skip to content
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

fix(debug command): update err msg int -> integer #2046

Merged
merged 3 commits into from
Jan 24, 2024
Merged

fix(debug command): update err msg int -> integer #2046

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02d7d73
🐞 fix(debug command): update err msg `int` -> `integer`
AntiTopQuark Jan 23, 2024
864c4f1
update fmt
AntiTopQuark Jan 23, 2024
e66adb1
Update src/common/status.h
mapleFU Jan 23, 2024
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
3 changes: 2 additions & 1 deletion src/commands/cmd_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,8 @@ class CommandDebug : public Commander {
*output = conn->NilString();
} else {
*output = redis::Error(
"Wrong protocol type name. Please use one of the following: string|int|array|set|bignum|true|false|null");
"Wrong protocol type name. Please use one of the following: "
"string|integer|array|set|bignum|true|false|null");
}
} else {
return {Status::RedisInvalidCmd, "Unknown subcommand, should be DEBUG or PROTOCOL"};
Expand Down
2 changes: 1 addition & 1 deletion src/common/status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ struct StringInStatusOr<T, std::enable_if_t<sizeof(T) < sizeof(std::string)>> :
StringInStatusOr(StringInStatusOr<U>&& v) : BaseType(new std::string(*std::move(v))) {} // NOLINT
template <typename U, typename std::enable_if_t<!StringInStatusOr<U>::inplace, int> = 0>
StringInStatusOr(StringInStatusOr<U>&& v) // NOLINT
: BaseType((typename StringInStatusOr<U>::BaseType &&)(std::move(v))) {}
: BaseType((typename StringInStatusOr<U>::BaseType&&)(std::move(v))) {}
Copy link
Member

@mapleFU mapleFU Jan 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @PragmaTwice 🤔 why would this file always get format?

Copy link
Member

@git-hulk git-hulk Jan 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was caused by clang-format-16 behaving differently from clang-format-14, that said clang-format-16 will remove the space between the type and &&, but clang-format-14 won't do that.

mapleFU marked this conversation as resolved.
Show resolved Hide resolved

StringInStatusOr(const StringInStatusOr& v) = delete;

Expand Down
Loading