Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
#27185)

also patch cxx crate from a22fc31
Change presubmit patch empty line to error to allow upstream patches that do not comply with Brave patching standards
  • Loading branch information
bridiver authored Jan 10, 2025
1 parent 7fa8bc2 commit 54ef40b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion patches/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def CheckPatchFile(input_api, output_api):
return []

return [
output_api.PresubmitError(
output_api.PresubmitPromptWarning(
'Patch should not add or remove empty lines at hunk boundaries',
items)
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/third_party/rust/chromium_crates_io/vendor/cxx-1.0.129/include/cxx.h b/third_party/rust/chromium_crates_io/vendor/cxx-1.0.129/include/cxx.h
index 3414e4c8a5434f6d43b8bf7a76e634ac0c7d06a5..03fa9bf730156c0926aef35bcf3fc0a98c98a0db 100644
--- a/third_party/rust/chromium_crates_io/vendor/cxx-1.0.129/include/cxx.h
+++ b/third_party/rust/chromium_crates_io/vendor/cxx-1.0.129/include/cxx.h
@@ -2,6 +2,7 @@
#include <algorithm>
#include <array>
#include <cassert>
+#include <concepts>
#include <cstddef>
#include <cstdint>
#include <exception>
@@ -244,6 +245,12 @@ public:
bool operator>(const iterator &) const noexcept;
bool operator>=(const iterator &) const noexcept;

+ using iterator_concept = std::contiguous_iterator_tag;
+ template <std::integral N>
+ friend iterator operator+(N n, const iterator &it) noexcept {
+ return it + n;
+ }
+
private:
friend class Slice;
void *pos;

0 comments on commit 54ef40b

Please sign in to comment.