Skip to content

F
folly
Commit 69a28bbf authored by Nicholas Ormrod's avatar Nicholas Ormrod Committed by Anton Likhtarov
Browse files
Options

Fix lint errors 

Summary: Pass const StringPieces by value instead of reference.

Test Plan:
fbconfig -r folly && fbmake runtests

Reviewed By: robbert@fb.com

Subscribers: trunkagent, sdwilsh, njormrod

FB internal diff: D1569488
parent 6fc7a48c
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
folly/Range.cpp
View file @ 69a28bbf
......@@ -32,20 +32,20 @@ namespace folly {
const AsciiCaseSensitive asciiCaseSensitive = AsciiCaseSensitive();
const AsciiCaseInsensitive asciiCaseInsensitive = AsciiCaseInsensitive();
std::ostream& operator<<(std::ostream& os, const StringPiece& piece) {
std::ostream& operator<<(std::ostream& os, const StringPiece piece) {
os.write(piece.start(), piece.size());
return os;
}
std::ostream& operator<<(std::ostream& os, const MutableStringPiece& piece) {
std::ostream& operator<<(std::ostream& os, const MutableStringPiece piece) {
os.write(piece.start(), piece.size());
return os;
}
namespace detail {
size_t qfind_first_byte_of_memchr(const StringPiece& haystack,
const StringPiece& needles) {
size_t qfind_first_byte_of_memchr(const StringPiece haystack,
const StringPiece needles) {
size_t best = haystack.size();
for (char needle: needles) {
const void* ptr = memchr(haystack.data(), needle, best);
......@@ -84,14 +84,14 @@ inline size_t nextAlignedIndex(const char* arr) {
}
// build sse4.2-optimized version even if -msse4.2 is not passed to GCC
size_t qfind_first_byte_of_needles16(const StringPiece& haystack,
const StringPiece& needles)
size_t qfind_first_byte_of_needles16(const StringPiece haystack,
const StringPiece needles)
__attribute__ ((__target__("sse4.2"), noinline))
FOLLY_DISABLE_ADDRESS_SANITIZER;
// helper method for case where needles.size() <= 16
size_t qfind_first_byte_of_needles16(const StringPiece& haystack,
const StringPiece& needles) {
size_t qfind_first_byte_of_needles16(const StringPiece haystack,
const StringPiece needles) {
DCHECK(!haystack.empty());
DCHECK(!needles.empty());
DCHECK_LE(needles.size(), 16);
......@@ -160,8 +160,8 @@ class FastByteSet {
namespace detail {
size_t qfind_first_byte_of_byteset(const StringPiece& haystack,
const StringPiece& needles) {
size_t qfind_first_byte_of_byteset(const StringPiece haystack,
const StringPiece needles) {
FastByteSet s;
for (auto needle: needles) {
s.add(needle);
......@@ -177,8 +177,8 @@ size_t qfind_first_byte_of_byteset(const StringPiece& haystack,
#if FOLLY_HAVE_EMMINTRIN_H && __GNUC_PREREQ(4, 6)
template <bool HAYSTACK_ALIGNED>
size_t scanHaystackBlock(const StringPiece& haystack,
const StringPiece& needles,
size_t scanHaystackBlock(const StringPiece haystack,
const StringPiece needles,
int64_t idx)
// inline is okay because it's only called from other sse4.2 functions
__attribute__ ((__target__("sse4.2")))
......@@ -193,8 +193,8 @@ size_t scanHaystackBlock(const StringPiece& haystack,
// If !HAYSTACK_ALIGNED, then caller must ensure that it is safe to load the
// block.
template <bool HAYSTACK_ALIGNED>
size_t scanHaystackBlock(const StringPiece& haystack,
const StringPiece& needles,
size_t scanHaystackBlock(const StringPiece haystack,
const StringPiece needles,
int64_t blockStartIdx) {
DCHECK_GT(needles.size(), 16); // should handled by *needles16() method
DCHECK(blockStartIdx + 16 <= haystack.size() ||
......@@ -230,12 +230,12 @@ size_t scanHaystackBlock(const StringPiece& haystack,
return StringPiece::npos;
}
size_t qfind_first_byte_of_sse42(const StringPiece& haystack,
const StringPiece& needles)
size_t qfind_first_byte_of_sse42(const StringPiece haystack,
const StringPiece needles)
__attribute__ ((__target__("sse4.2"), noinline));
size_t qfind_first_byte_of_sse42(const StringPiece& haystack,
const StringPiece& needles) {
size_t qfind_first_byte_of_sse42(const StringPiece haystack,
const StringPiece needles) {
if (UNLIKELY(needles.empty() || haystack.empty())) {
return StringPiece::npos;
} else if (needles.size() <= 16) {
......@@ -270,8 +270,8 @@ size_t qfind_first_byte_of_sse42(const StringPiece& haystack,
}
#endif // FOLLY_HAVE_EMMINTRIN_H && GCC 4.6+
size_t qfind_first_byte_of_nosse(const StringPiece& haystack,
const StringPiece& needles) {
size_t qfind_first_byte_of_nosse(const StringPiece haystack,
const StringPiece needles) {
if (UNLIKELY(needles.empty() || haystack.empty())) {
return StringPiece::npos;
}
......
folly/Range.h
View file @ 69a28bbf
......@@ -803,8 +803,8 @@ typedef Range<char*> MutableStringPiece;
typedef Range<const unsigned char*> ByteRange;
typedef Range<unsigned char*> MutableByteRange;
std::ostream& operator<<(std::ostream& os, const StringPiece& piece);
std::ostream& operator<<(std::ostream& os, const MutableStringPiece& piece);
std::ostream& operator<<(std::ostream& os, const StringPiece piece);
std::ostream& operator<<(std::ostream& os, const MutableStringPiece piece);
/**
* Templated comparison operators
......@@ -891,7 +891,7 @@ operator>=(const T& lhs, const U& rhs) {
}
struct StringPieceHash {
std::size_t operator()(const StringPiece& str) const {
std::size_t operator()(const StringPiece str) const {
return static_cast<std::size_t>(str.hash());
}
};
......@@ -957,15 +957,15 @@ size_t qfind(const Range<T>& haystack,
namespace detail {
size_t qfind_first_byte_of_nosse(const StringPiece& haystack,
const StringPiece& needles);
size_t qfind_first_byte_of_nosse(const StringPiece haystack,
const StringPiece needles);
#if FOLLY_HAVE_EMMINTRIN_H && __GNUC_PREREQ(4, 6)
size_t qfind_first_byte_of_sse42(const StringPiece& haystack,
const StringPiece& needles);
size_t qfind_first_byte_of_sse42(const StringPiece haystack,
const StringPiece needles);
inline size_t qfind_first_byte_of(const StringPiece& haystack,
const StringPiece& needles) {
inline size_t qfind_first_byte_of(const StringPiece haystack,
const StringPiece needles) {
static auto const qfind_first_byte_of_fn =
folly::CpuId().sse42() ? qfind_first_byte_of_sse42
: qfind_first_byte_of_nosse;
......@@ -973,8 +973,8 @@ inline size_t qfind_first_byte_of(const StringPiece& haystack,
}
#else
inline size_t qfind_first_byte_of(const StringPiece& haystack,
const StringPiece& needles) {
inline size_t qfind_first_byte_of(const StringPiece haystack,
const StringPiece needles) {
return qfind_first_byte_of_nosse(haystack, needles);
}
#endif // FOLLY_HAVE_EMMINTRIN_H
......
folly/detail/SlowFingerprint.h
View file @ 69a28bbf
......@@ -54,7 +54,7 @@ class SlowFingerprint {
return *this;
}
SlowFingerprint& update(const folly::StringPiece& str) {
SlowFingerprint& update(const folly::StringPiece str) {
const char* p = str.start();
for (int i = str.size(); i != 0; p++, i--) {
update8(static_cast<uint8_t>(*p));
......
folly/gen/String-inl.h
View file @ 69a28bbf
......@@ -269,7 +269,7 @@ class SplitStringSource
StringPiece source_;
DelimiterType delimiter_;
public:
SplitStringSource(const StringPiece& source,
SplitStringSource(const StringPiece source,
DelimiterType delimiter)
: source_(source)
, delimiter_(std::move(delimiter)) { }
......
folly/gen/String.h
View file @ 69a28bbf
......@@ -60,7 +60,7 @@ S resplit(char delimiter) {
}
template <class S = detail::SplitStringSource<char>>
S split(const StringPiece& source, char delimiter) {
S split(const StringPiece source, char delimiter) {
return S(source, delimiter);
}
......
folly/test/RangeFindBenchmark.cpp
View file @ 69a28bbf
......@@ -24,14 +24,14 @@
namespace folly { namespace detail {
// declaration of functions in Range.cpp
size_t qfind_first_byte_of_memchr(const StringPiece& haystack,
const StringPiece& needles);
size_t qfind_first_byte_of_memchr(const StringPiece haystack,
const StringPiece needles);
size_t qfind_first_byte_of_byteset(const StringPiece& haystack,
const StringPiece& needles);
size_t qfind_first_byte_of_byteset(const StringPiece haystack,
const StringPiece needles);
size_t qfind_first_byte_of_nosse(const StringPiece& haystack,
const StringPiece& needles);
size_t qfind_first_byte_of_nosse(const StringPiece haystack,
const StringPiece needles);
}}
using namespace folly;
......@@ -131,15 +131,15 @@ BENCHMARK_RELATIVE(FindSingleCharRange, n) {
BENCHMARK_DRAW_LINE();
// it's useful to compare our custom implementations vs. the standard library
inline size_t qfind_first_byte_of_std(const StringPiece& haystack,
const StringPiece& needles) {
inline size_t qfind_first_byte_of_std(const StringPiece haystack,
const StringPiece needles) {
return qfind_first_of(haystack, needles, asciiCaseSensitive);
}
template <class Func>
void findFirstOfRange(StringPiece needles, Func func, size_t n) {
FOR_EACH_RANGE (i, 0, n) {
const StringPiece& haystack = vstr[i % kVstrSize];
const StringPiece haystack = vstr[i % kVstrSize];
doNotOptimizeAway(func(haystack, needles));
char x = haystack[0];
doNotOptimizeAway(&x);
......
folly/test/RangeTest.cpp
View file @ 69a28bbf
......@@ -34,11 +34,11 @@
namespace folly { namespace detail {
// declaration of functions in Range.cpp
size_t qfind_first_byte_of_memchr(const StringPiece& haystack,
const StringPiece& needles);
size_t qfind_first_byte_of_memchr(const StringPiece haystack,
const StringPiece needles);
size_t qfind_first_byte_of_byteset(const StringPiece& haystack,
const StringPiece& needles);
size_t qfind_first_byte_of_byteset(const StringPiece haystack,
const StringPiece needles);
}} // namespaces
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment