From 389fb8a530ecfc37bc441ddb266b1a587d9de06d Mon Sep 17 00:00:00 2001 From: Tom Jackson Date: Tue, 13 Nov 2012 19:20:58 -0800 Subject: [PATCH] Removing unneeded eachAs() operators Summary: ##byLine## already yields StringPieces, no neat to ##eachAs()## then. Test Plan: fbconfig folly/experimental/symbolizer folly/test folly/experimental/io folly/experimental/io/test tupperware/agent fbmake opt Reviewed By: tudorb@fb.com FB internal diff: D630422 --- folly/experimental/io/HugePages.cpp | 2 +- folly/experimental/symbolizer/Symbolizer.cpp | 2 +- folly/test/SubprocessTest.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/folly/experimental/io/HugePages.cpp b/folly/experimental/io/HugePages.cpp index e0e33bcc..cf93ce0b 100644 --- a/folly/experimental/io/HugePages.cpp +++ b/folly/experimental/io/HugePages.cpp @@ -54,7 +54,7 @@ size_t getDefaultHugePageSize() { size_t pageSize = 0; boost::cmatch match; - bool error = gen::byLine("/proc/meminfo") | gen::eachAs() | + bool error = gen::byLine("/proc/meminfo") | [&] (StringPiece line) -> bool { if (boost::regex_match(line.begin(), line.end(), match, regex)) { StringPiece numStr(line.begin() + match.position(1), match.length(1)); diff --git a/folly/experimental/symbolizer/Symbolizer.cpp b/folly/experimental/symbolizer/Symbolizer.cpp index 714cac76..aa5280cd 100644 --- a/folly/experimental/symbolizer/Symbolizer.cpp +++ b/folly/experimental/symbolizer/Symbolizer.cpp @@ -77,7 +77,7 @@ bool Symbolizer::symbolize(uintptr_t address, StringPiece& symbolName, boost::cmatch match; MappedFile foundFile; - bool error = gen::byLine("/proc/self/maps") | gen::eachAs() | + bool error = gen::byLine("/proc/self/maps") | [&] (StringPiece line) -> bool { CHECK(boost::regex_match(line.begin(), line.end(), match, mapLineRegex)); uint64_t begin = fromHex(sp(match[1])); diff --git a/folly/test/SubprocessTest.cpp b/folly/test/SubprocessTest.cpp index bf8e0768..1b7c0079 100644 --- a/folly/test/SubprocessTest.cpp +++ b/folly/test/SubprocessTest.cpp @@ -59,7 +59,7 @@ TEST(SimpleSubprocessTest, ShellExitsWithError) { TEST(PopenSubprocessTest, PopenRead) { Subprocess proc("ls /", Subprocess::pipeStdout()); int found = 0; - gen::byLine(proc.stdout()) | gen::eachAs() | + gen::byLine(proc.stdout()) | [&] (StringPiece line) { if (line == "etc" || line == "bin" || line == "usr") { ++found; -- 2.34.1