Skip to content

Commit b2180ae

Browse files
jeremy-rifkinjeremy-rifkin
committed
Rename builder methods
1 parent f0a9e12 commit b2180ae

5 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎include/cpptrace/formatting.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ namespace cpptrace {
2121
formatter& operator=(formatter&&);
2222
formatter& operator=(const formatter&);
2323

24-
formatter& set_header(std::string);
24+
formatter& header(std::string);
2525
enum class color_mode {
2626
always,
2727
none,
2828
automatic,
2929
};
30-
formatter& set_color_mode(color_mode);
30+
formatter& colors(color_mode);
3131
enum class address_mode {
3232
raw,
3333
object,
3434
none,
3535
};
36-
formatter& set_address_mode(address_mode);
37-
formatter& set_snippets(bool);
38-
formatter& set_snippet_context(int);
39-
formatter& include_column(bool);
40-
formatter& show_filtered_frames(bool);
41-
formatter& set_filter(std::function<bool(const stacktrace_frame&)>);
36+
formatter& addresses(address_mode);
37+
formatter& snippets(bool);
38+
formatter& snippet_context(int);
39+
formatter& columns(bool);
40+
formatter& filtered_frame_placeholders(bool);
41+
formatter& filter(std::function<bool(const stacktrace_frame&)>);
4242

4343
std::string format(const stacktrace_frame&) const;
4444
std::string format(const stacktrace_frame&, bool color) const;

‎src/cpptrace.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ namespace cpptrace {
183183

184184
namespace detail {
185185
const formatter& get_default_snippet_formatter() {
186-
static formatter snippet_formatter = formatter{}.set_snippets(true);
186+
static formatter snippet_formatter = formatter{}.snippets(true);
187187
return snippet_formatter;
188188
}
189189
}

‎src/formatting.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@ namespace cpptrace {
2626
} options;
2727

2828
public:
29-
void set_header(std::string header) {
29+
void header(std::string header) {
3030
options.header = std::move(header);
3131
}
32-
void set_color_mode(formatter::color_mode mode) {
32+
void colors(formatter::color_mode mode) {
3333
options.color = mode;
3434
}
35-
void set_address_mode(formatter::address_mode mode) {
35+
void addresses(formatter::address_mode mode) {
3636
options.addresses = mode;
3737
}
38-
void set_snippets(bool snippets) {
38+
void snippets(bool snippets) {
3939
options.snippets = snippets;
4040
}
41-
void set_snippet_context(int lines) {
41+
void snippet_context(int lines) {
4242
options.context_lines = lines;
4343
}
44-
void include_column(bool columns) {
44+
void columns(bool columns) {
4545
options.columns = columns;
4646
}
47-
void show_filtered_frames(bool show) {
47+
void filtered_frame_placeholders(bool show) {
4848
options.show_filtered_frames = show;
4949
}
50-
void set_filter(std::function<bool(const stacktrace_frame&)> filter) {
50+
void filter(std::function<bool(const stacktrace_frame&)> filter) {
5151
options.filter = filter;
5252
}
5353

@@ -246,36 +246,36 @@ namespace cpptrace {
246246
return *this;
247247
}
248248

249-
formatter& formatter::set_header(std::string header) {
250-
pimpl->set_header(std::move(header));
249+
formatter& formatter::header(std::string header) {
250+
pimpl->header(std::move(header));
251251
return *this;
252252
}
253-
formatter& formatter::set_color_mode(color_mode mode) {
254-
pimpl->set_color_mode(mode);
253+
formatter& formatter::colors(color_mode mode) {
254+
pimpl->colors(mode);
255255
return *this;
256256
}
257-
formatter& formatter::set_address_mode(address_mode mode) {
258-
pimpl->set_address_mode(mode);
257+
formatter& formatter::addresses(address_mode mode) {
258+
pimpl->addresses(mode);
259259
return *this;
260260
}
261-
formatter& formatter::set_snippets(bool snippets) {
262-
pimpl->set_snippets(snippets);
261+
formatter& formatter::snippets(bool snippets) {
262+
pimpl->snippets(snippets);
263263
return *this;
264264
}
265-
formatter& formatter::set_snippet_context(int lines) {
266-
pimpl->set_snippet_context(lines);
265+
formatter& formatter::snippet_context(int lines) {
266+
pimpl->snippet_context(lines);
267267
return *this;
268268
}
269-
formatter& formatter::include_column(bool columns) {
270-
pimpl->include_column(columns);
269+
formatter& formatter::columns(bool columns) {
270+
pimpl->columns(columns);
271271
return *this;
272272
}
273-
formatter& formatter::show_filtered_frames(bool show) {
274-
pimpl->show_filtered_frames(show);
273+
formatter& formatter::filtered_frame_placeholders(bool show) {
274+
pimpl->filtered_frame_placeholders(show);
275275
return *this;
276276
}
277-
formatter& formatter::set_filter(std::function<bool(const stacktrace_frame&)> filter) {
278-
pimpl->set_filter(std::move(filter));
277+
formatter& formatter::filter(std::function<bool(const stacktrace_frame&)> filter) {
278+
pimpl->filter(std::move(filter));
279279
return *this;
280280
}
281281

‎src/utils.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace cpptrace {
3030
CPPTRACE_FORCE_NO_INLINE void print_terminate_trace() {
3131
try { // try/catch can never be hit but it's needed to prevent TCO
3232
formatter{}
33-
.set_header("Stack trace to reach terminate handler (most recent call first):")
33+
.header("Stack trace to reach terminate handler (most recent call first):")
3434
.print(std::cerr, generate_trace(1));
3535
} catch(...) {
3636
if(!detail::should_absorb_trace_exceptions()) {

‎test/unit/lib/formatting.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ TEST(FormatterTest, Inlines) {
5353

5454
TEST(FormatterTest, Header) {
5555
auto formatter = cpptrace::formatter{}
56-
.set_header("Stack trace:");
56+
.header("Stack trace:");
5757
auto res = split(formatter.format(make_test_stacktrace()), "\n");
5858
EXPECT_THAT(
5959
res,
@@ -68,7 +68,7 @@ TEST(FormatterTest, Header) {
6868

6969
TEST(FormatterTest, NoColumn) {
7070
auto formatter = cpptrace::formatter{}
71-
.include_column(false);
71+
.columns(false);
7272
auto res = split(formatter.format(make_test_stacktrace()), "\n");
7373
EXPECT_THAT(
7474
res,
@@ -83,7 +83,7 @@ TEST(FormatterTest, NoColumn) {
8383

8484
TEST(FormatterTest, ObjectAddresses) {
8585
auto formatter = cpptrace::formatter{}
86-
.set_address_mode(cpptrace::formatter::address_mode::object);
86+
.addresses(cpptrace::formatter::address_mode::object);
8787
auto res = split(formatter.format(make_test_stacktrace()), "\n");
8888
EXPECT_THAT(
8989
res,
@@ -103,7 +103,7 @@ TEST(FormatterTest, Snippets) {
103103
trace.frames.push_back({0x1, 0x1001, {line}, {20}, __FILE__, "foo()", false});
104104
trace.frames.push_back({0x2, 0x1002, {line + 1}, {20}, __FILE__, "foo()", false});
105105
auto formatter = cpptrace::formatter{}
106-
.set_snippets(true);
106+
.snippets(true);
107107
auto res = split(formatter.format(trace), "\n");
108108
EXPECT_THAT(
109109
res,
@@ -134,10 +134,10 @@ TEST(FormatterTest, Snippets) {
134134
line + 1
135135
),
136136
cpptrace::microfmt::format(" {}: auto formatter = cpptrace::formatter{{}}", line + 2),
137-
cpptrace::microfmt::format(" {}: .set_snippets(true);", line + 3)
137+
cpptrace::microfmt::format(" {}: .snippets(true);", line + 3)
138138
)
139139
);
140-
formatter.set_snippet_context(1);
140+
formatter.snippet_context(1);
141141
res = split(formatter.format(trace), "\n");
142142
EXPECT_THAT(
143143
res,
@@ -172,7 +172,7 @@ TEST(FormatterTest, Snippets) {
172172

173173
TEST(FormatterTest, Colors) {
174174
auto formatter = cpptrace::formatter{}
175-
.set_color_mode(cpptrace::formatter::color_mode::always);
175+
.colors(cpptrace::formatter::color_mode::always);
176176
auto res = split(formatter.format(make_test_stacktrace()), "\n");
177177
EXPECT_THAT(
178178
res,
@@ -187,7 +187,7 @@ TEST(FormatterTest, Colors) {
187187

188188
TEST(FormatterTest, Filtering) {
189189
auto formatter = cpptrace::formatter{}
190-
.set_filter([] (const cpptrace::stacktrace_frame& frame) -> bool {
190+
.filter([] (const cpptrace::stacktrace_frame& frame) -> bool {
191191
return frame.filename.find("foo.cpp") != std::string::npos;
192192
});
193193
auto res = split(formatter.format(make_test_stacktrace()), "\n");
@@ -204,10 +204,10 @@ TEST(FormatterTest, Filtering) {
204204

205205
TEST(FormatterTest, DontShowFilteredFrames) {
206206
auto formatter = cpptrace::formatter{}
207-
.set_filter([] (const cpptrace::stacktrace_frame& frame) -> bool {
207+
.filter([] (const cpptrace::stacktrace_frame& frame) -> bool {
208208
return frame.filename.find("foo.cpp") != std::string::npos;
209209
})
210-
.show_filtered_frames(false);
210+
.filtered_frame_placeholders(false);
211211
auto res = split(formatter.format(make_test_stacktrace()), "\n");
212212
EXPECT_THAT(
213213
res,
@@ -221,7 +221,7 @@ TEST(FormatterTest, DontShowFilteredFrames) {
221221

222222
TEST(FormatterTest, MoveSemantics) {
223223
auto formatter = cpptrace::formatter{}
224-
.set_filter([] (const cpptrace::stacktrace_frame& frame) -> bool {
224+
.filter([] (const cpptrace::stacktrace_frame& frame) -> bool {
225225
return frame.filename.find("foo.cpp") != std::string::npos;
226226
});
227227
auto formatter2 = std::move(formatter);
@@ -251,7 +251,7 @@ TEST(FormatterTest, MoveSemantics) {
251251

252252
TEST(FormatterTest, CopySemantics) {
253253
auto formatter = cpptrace::formatter{}
254-
.set_filter([] (const cpptrace::stacktrace_frame& frame) -> bool {
254+
.filter([] (const cpptrace::stacktrace_frame& frame) -> bool {
255255
return frame.filename.find("foo.cpp") != std::string::npos;
256256
});
257257
auto formatter2 = formatter;

0 commit comments

Comments
 (0)