Skip to content

Commit 1644d6a

Browse files
Revert "Reapply "revert to solution with broken windows""
This reverts commit d206887.
1 parent 618d918 commit 1644d6a

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

src/version_weaver.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ std::string minimum(std::string_view range) { return ""; }
3737
std::expected<std::string, parse_error> inc(version input,
3838
release_type release_type) {
3939
version_weaver::version result;
40+
std::string incremented;
4041
switch (release_type) {
4142
case MAJOR:
4243
case PRE_MAJOR: {
@@ -48,8 +49,8 @@ std::expected<std::string, parse_error> inc(version input,
4849
return std::unexpected(parse_error::INVALID_MAJOR);
4950
}
5051
auto incremented_major_int = major_int + 1;
51-
auto major = std::to_string(incremented_major_int);
52-
result = version_weaver::version{major, "0", "0"};
52+
incremented = std::to_string(incremented_major_int);
53+
result = version_weaver::version{incremented, "0", "0"};
5354
break;
5455
}
5556
case MINOR:
@@ -62,8 +63,8 @@ std::expected<std::string, parse_error> inc(version input,
6263
return std::unexpected(parse_error::INVALID_MINOR);
6364
}
6465
auto incremented_minor_int = minor_int + 1;
65-
result = version_weaver::version{
66-
input.major, std::to_string(incremented_minor_int), "0"};
66+
incremented = std::to_string(incremented_minor_int);
67+
result = version_weaver::version{input.major, incremented, "0"};
6768
break;
6869
}
6970
case PATCH:
@@ -86,9 +87,9 @@ std::expected<std::string, parse_error> inc(version input,
8687
return std::unexpected(parse_error::INVALID_PRERELEASE);
8788
}
8889
auto incremented_prerelease_int = prerelease_int + 1;
89-
return version_weaver::version{
90-
input.major, input.minor, input.patch,
91-
std::to_string(incremented_prerelease_int)};
90+
incremented = std::to_string(incremented_prerelease_int);
91+
return version_weaver::version{input.major, input.minor, input.patch,
92+
incremented};
9293
}
9394
int patch_int;
9495
auto [ptr, ec] =
@@ -98,8 +99,8 @@ std::expected<std::string, parse_error> inc(version input,
9899
return std::unexpected(parse_error::INVALID_PATCH);
99100
}
100101
auto incremented_patch_int = patch_int + 1;
101-
result = version_weaver::version{input.major, input.minor,
102-
std::to_string(incremented_patch_int)};
102+
incremented = std::to_string(incremented_patch_int);
103+
result = version_weaver::version{input.major, input.minor, incremented};
103104
break;
104105
}
105106
case RELEASE: {

0 commit comments

Comments
 (0)