Skip to content

Commit a0f39d2

Browse files
committed
Accidentally bonked this during a merge conflict resolution.
1 parent ac05b58 commit a0f39d2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Diff for: lib/src/main/java/com/diffplug/spotless/FormatterStep.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ static <RoundtripState extends Serializable, EqualityState extends Serializable>
151151
static <State extends Serializable> FormatterStep createLazy(
152152
String name,
153153
ThrowingEx.Supplier<State> stateSupplier,
154-
SerializedFunction<State, FormatterFunc> stateToFormatter) {
155-
return createLazy(name, stateSupplier, SerializedFunction.identity(), stateToFormatter);
154+
ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
155+
return new FormatterStepImpl.Standard<>(name, stateSupplier, stateToFormatter);
156156
}
157157

158158
/**
@@ -168,7 +168,7 @@ static <State extends Serializable> FormatterStep createLazy(
168168
static <State extends Serializable> FormatterStep create(
169169
String name,
170170
State state,
171-
SerializedFunction<State, FormatterFunc> stateToFormatter) {
171+
ThrowingEx.Function<State, FormatterFunc> stateToFormatter) {
172172
Objects.requireNonNull(state, "state");
173173
return createLazy(name, () -> state, stateToFormatter);
174174
}

0 commit comments

Comments
 (0)