From 53e3d1b42e619125711719778e816e64658ff65d Mon Sep 17 00:00:00 2001 From: Yoo Chung Date: Wed, 2 Oct 2024 14:59:23 +0000 Subject: [PATCH] Fix error introduced during rebasing. --- proto-lens-protoc/app/Data/ProtoLens/Compiler/Definitions.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proto-lens-protoc/app/Data/ProtoLens/Compiler/Definitions.hs b/proto-lens-protoc/app/Data/ProtoLens/Compiler/Definitions.hs index 6fa99cf8..10b7430f 100644 --- a/proto-lens-protoc/app/Data/ProtoLens/Compiler/Definitions.hs +++ b/proto-lens-protoc/app/Data/ProtoLens/Compiler/Definitions.hs @@ -129,9 +129,9 @@ This includes the file-scope options which override the feature defaults for an edition. -} fileFeatures :: FileDescriptorProto -> Either Text FeatureSet -fileFeatures f = +fileFeatures f = do edition <- fileEdition f - features <- featuresForEdition + features <- featuresForEdition edition return $ case f ^. #options . #maybe'features of Just overrides -> overrides `mergedInto` features Nothing -> features