mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 13:38:11 +00:00
Everywhere: Rename {Deprecated => Byte}String
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
parent
38d62563b3
commit
5e1499d104
1615 changed files with 10257 additions and 10257 deletions
|
@ -13,9 +13,9 @@
|
|||
namespace SQL {
|
||||
|
||||
struct TupleElementDescriptor {
|
||||
DeprecatedString schema { "" };
|
||||
DeprecatedString table { "" };
|
||||
DeprecatedString name { "" };
|
||||
ByteString schema { "" };
|
||||
ByteString table { "" };
|
||||
ByteString name { "" };
|
||||
SQLType type { SQLType::Text };
|
||||
Order order { Order::Ascending };
|
||||
|
||||
|
@ -29,7 +29,7 @@ struct TupleElementDescriptor {
|
|||
}
|
||||
void deserialize(Serializer& serializer)
|
||||
{
|
||||
name = serializer.deserialize<DeprecatedString>();
|
||||
name = serializer.deserialize<ByteString>();
|
||||
type = (SQLType)serializer.deserialize<u8>();
|
||||
order = (Order)serializer.deserialize<u8>();
|
||||
}
|
||||
|
@ -39,9 +39,9 @@ struct TupleElementDescriptor {
|
|||
return sizeof(u32) + name.length() + 2 * sizeof(u8);
|
||||
}
|
||||
|
||||
DeprecatedString to_deprecated_string() const
|
||||
ByteString to_byte_string() const
|
||||
{
|
||||
return DeprecatedString::formatted(" name: {} type: {} order: {}", name, SQLType_name(type), Order_name(order));
|
||||
return ByteString::formatted(" name: {} type: {} order: {}", name, SQLType_name(type), Order_name(order));
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -90,12 +90,12 @@ public:
|
|||
return len;
|
||||
}
|
||||
|
||||
DeprecatedString to_deprecated_string() const
|
||||
ByteString to_byte_string() const
|
||||
{
|
||||
Vector<DeprecatedString> elements;
|
||||
Vector<ByteString> elements;
|
||||
for (auto& element : *this)
|
||||
elements.append(element.to_deprecated_string());
|
||||
return DeprecatedString::formatted("[\n{}\n]", DeprecatedString::join('\n', elements));
|
||||
elements.append(element.to_byte_string());
|
||||
return ByteString::formatted("[\n{}\n]", ByteString::join('\n', elements));
|
||||
}
|
||||
|
||||
using Vector<TupleElementDescriptor>::operator==;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue