Skip to content

Migrate Crubit support library namespace from rs_std:: to rs::. #57

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate Crubit support library namespace from rs_std:: to rs::. #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions leveldb/leveldb.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace {

using ::security::crubit_helpers::StringViewFromVecU8;

rs_std::SliceRef<const uint8_t> StringViewToSliceRef(absl::string_view sv) {
return rs_std::SliceRef<const uint8_t>(absl::Span<const uint8_t>(
rs::SliceRef<const uint8_t> StringViewToSliceRef(absl::string_view sv) {
return rs::SliceRef<const uint8_t>(absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(sv.data()), sv.size()));
}

Expand Down Expand Up @@ -64,8 +64,7 @@ absl::Status LevelDBErrorToStatus(const rust::LevelDBError& err) {
}

template <typename T>
absl::Status ResultToStatus(
rs_std::Result<T, rust::LevelDBError>&& result) {
absl::Status ResultToStatus(rs::Result<T, rust::LevelDBError>&& result) {
if (result.has_value()) {
return absl::OkStatus();
}
Expand Down Expand Up @@ -134,7 +133,7 @@ void WriteBatch::Clear() { rs_batch_.clear(); }

absl::StatusOr<std::unique_ptr<DB>> DB::Open(absl::string_view name,
Options options) {
auto name_ref = rs_std::StrRef::FromUtf8(name);
auto name_ref = rs::StrRef::FromUtf8(name);
if (!name_ref.has_value()) {
return absl::InvalidArgumentError("Invalid UTF-8 in database name");
}
Expand Down
70 changes: 35 additions & 35 deletions serde_json/serde_json_bridge.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ absl::StatusOr<SerdeJson> SerdeJson::CreateInt(int64_t value) {
}

absl::StatusOr<SerdeJson> SerdeJson::CreateDouble(double value) {
rs_std::Result<rust::json::SerdeJson,
rust::raw_string::RawString>
rs::Result<rust::json::SerdeJson,
rust::raw_string::RawString>
rs_result = rust::json::SerdeJson::create_double(value);

if (!rs_result.has_value()) {
Expand All @@ -80,8 +80,8 @@ absl::StatusOr<SerdeJson> SerdeJson::CreateNull() {
}

absl::StatusOr<SerdeJson> SerdeJson::CreateString(absl::string_view value) {
rs_std::Result<rust::json::SerdeJson,
rust::raw_string::RawString>
rs::Result<rust::json::SerdeJson,
rust::raw_string::RawString>
rs_result = rust::json::SerdeJson::create_string(
absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(value.data()), value.size()));
Expand All @@ -94,8 +94,8 @@ absl::StatusOr<SerdeJson> SerdeJson::CreateString(absl::string_view value) {
}

absl::StatusOr<SerdeJson> SerdeJson::Parse(absl::string_view data) {
rs_std::Result<rust::json::SerdeJson,
rust::raw_string::RawString>
rs::Result<rust::json::SerdeJson,
rust::raw_string::RawString>
rs_result = rust::json::SerdeJson::parse_string(
absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(data.data()), data.size()));
Expand All @@ -108,8 +108,8 @@ absl::StatusOr<SerdeJson> SerdeJson::Parse(absl::string_view data) {
}

absl::StatusOr<SerdeJson> SerdeJson::GetField(absl::string_view key) const {
rs_std::Result<rust::json::SerdeJson,
rust::raw_string::RawString>
rs::Result<rust::json::SerdeJson,
rust::raw_string::RawString>
rs_result = json_obj_.get_field(absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(key.data()), key.size()));

Expand All @@ -123,8 +123,8 @@ absl::StatusOr<SerdeJson> SerdeJson::GetField(absl::string_view key) const {

absl::StatusOr<SerdeJson> SerdeJson::GetFieldObject(
absl::string_view key) const {
rs_std::Result<rust::json::SerdeJson,
rust::raw_string::RawString>
rs::Result<rust::json::SerdeJson,
rust::raw_string::RawString>
rs_result = json_obj_.get_field_object(absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(key.data()), key.size()));

Expand All @@ -137,7 +137,7 @@ absl::StatusOr<SerdeJson> SerdeJson::GetFieldObject(
}

absl::StatusOr<bool> SerdeJson::GetBool() const {
rs_std::Result<bool, rust::raw_string::RawString> rs_result =
rs::Result<bool, rust::raw_string::RawString> rs_result =
json_obj_.get_bool();

if (!rs_result.has_value()) {
Expand All @@ -149,8 +149,8 @@ absl::StatusOr<bool> SerdeJson::GetBool() const {
}

absl::StatusOr<std::string> SerdeJson::GetString() const {
rs_std::Result<rust::raw_string::RawString,
rust::raw_string::RawString>
rs::Result<rust::raw_string::RawString,
rust::raw_string::RawString>
rs_result = json_obj_.get_string();

if (!rs_result.has_value()) {
Expand All @@ -162,8 +162,8 @@ absl::StatusOr<std::string> SerdeJson::GetString() const {
}

absl::StatusOr<int64_t> SerdeJson::GetInt() const {
rs_std::Result<int64_t, rust::raw_string::RawString>
rs_result = json_obj_.get_int();
rs::Result<int64_t, rust::raw_string::RawString> rs_result =
json_obj_.get_int();

if (!rs_result.has_value()) {
return absl::FailedPreconditionError(
Expand All @@ -174,8 +174,8 @@ absl::StatusOr<int64_t> SerdeJson::GetInt() const {
}

absl::StatusOr<double> SerdeJson::GetDouble() const {
rs_std::Result<double, rust::raw_string::RawString>
rs_result = json_obj_.get_double();
rs::Result<double, rust::raw_string::RawString> rs_result =
json_obj_.get_double();

if (!rs_result.has_value()) {
return absl::FailedPreconditionError(
Expand All @@ -186,8 +186,8 @@ absl::StatusOr<double> SerdeJson::GetDouble() const {
}

absl::StatusOr<std::vector<SerdeJson>> SerdeJson::GetArray() const {
rs_std::Result<rust::json::VecSerdeJson,
rust::raw_string::RawString>
rs::Result<rust::json::VecSerdeJson,
rust::raw_string::RawString>
rs_result = json_obj_.get_array();

if (!rs_result.has_value()) {
Expand All @@ -199,8 +199,8 @@ absl::StatusOr<std::vector<SerdeJson>> SerdeJson::GetArray() const {
}

absl::StatusOr<SerdeJson> SerdeJson::GetArrayElement(size_t index) const {
rs_std::Result<rust::json::SerdeJson,
rust::json::GetArrayElementError>
rs::Result<rust::json::SerdeJson,
rust::json::GetArrayElementError>
rs_result = json_obj_.get_array_element(index);

if (!rs_result.has_value()) {
Expand All @@ -218,8 +218,8 @@ absl::StatusOr<SerdeJson> SerdeJson::GetArrayElement(size_t index) const {

absl::StatusOr<std::string> SerdeJson::GetFieldString(
absl::string_view key) const {
rs_std::Result<rust::raw_string::RawString,
rust::raw_string::RawString>
rs::Result<rust::raw_string::RawString,
rust::raw_string::RawString>
rs_result = json_obj_.get_field_string(absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(key.data()), key.size()));

Expand All @@ -232,7 +232,7 @@ absl::StatusOr<std::string> SerdeJson::GetFieldString(
}

absl::StatusOr<bool> SerdeJson::GetFieldBool(absl::string_view key) const {
rs_std::Result<bool, rust::raw_string::RawString> rs_result =
rs::Result<bool, rust::raw_string::RawString> rs_result =
json_obj_.get_field_bool(absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(key.data()), key.size()));

Expand All @@ -245,8 +245,8 @@ absl::StatusOr<bool> SerdeJson::GetFieldBool(absl::string_view key) const {
}

absl::StatusOr<int64_t> SerdeJson::GetFieldInt(absl::string_view key) const {
rs_std::Result<int64_t, rust::raw_string::RawString>
rs_result = json_obj_.get_field_int(absl::Span<const uint8_t>(
rs::Result<int64_t, rust::raw_string::RawString> rs_result =
json_obj_.get_field_int(absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(key.data()), key.size()));

if (!rs_result.has_value()) {
Expand All @@ -258,8 +258,8 @@ absl::StatusOr<int64_t> SerdeJson::GetFieldInt(absl::string_view key) const {
}

absl::StatusOr<double> SerdeJson::GetFieldDouble(absl::string_view key) const {
rs_std::Result<double, rust::raw_string::RawString>
rs_result = json_obj_.get_field_double(absl::Span<const uint8_t>(
rs::Result<double, rust::raw_string::RawString> rs_result =
json_obj_.get_field_double(absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(key.data()), key.size()));

if (!rs_result.has_value()) {
Expand All @@ -272,8 +272,8 @@ absl::StatusOr<double> SerdeJson::GetFieldDouble(absl::string_view key) const {

absl::StatusOr<std::vector<SerdeJson>> SerdeJson::GetFieldArray(
absl::string_view key) const {
rs_std::Result<rust::json::VecSerdeJson,
rust::raw_string::RawString>
rs::Result<rust::json::VecSerdeJson,
rust::raw_string::RawString>
rs_result = json_obj_.get_field_array(absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(key.data()), key.size()));

Expand All @@ -287,8 +287,8 @@ absl::StatusOr<std::vector<SerdeJson>> SerdeJson::GetFieldArray(

absl::StatusOr<SerdeJson> SerdeJson::GetFieldArrayElement(absl::string_view key,
size_t index) const {
rs_std::Result<rust::json::SerdeJson,
rust::json::GetArrayElementError>
rs::Result<rust::json::SerdeJson,
rust::json::GetArrayElementError>
rs_result = json_obj_.get_field_array_element(
absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(key.data()), key.size()),
Expand Down Expand Up @@ -330,8 +330,8 @@ std::string SerdeJson::ToString(bool sort_keys) const {
}

absl::StatusOr<std::vector<std::string>> SerdeJson::GetKeys() const {
rs_std::Result<rust::json::VecRawString,
rust::raw_string::RawString>
rs::Result<rust::json::VecRawString,
rust::raw_string::RawString>
rs_result = json_obj_.get_keys();

if (!rs_result.has_value()) {
Expand All @@ -350,7 +350,7 @@ absl::StatusOr<std::vector<std::string>> SerdeJson::GetKeys() const {
}

absl::StatusOr<bool> SerdeJson::HasField(absl::string_view key) const {
rs_std::Result<bool, rust::raw_string::RawString> rs_result =
rs::Result<bool, rust::raw_string::RawString> rs_result =
json_obj_.has_field(absl::Span<const uint8_t>(
reinterpret_cast<const uint8_t*>(key.data()), key.size()));

Expand Down
Loading