Skip to content

Commit b370ca5

Browse files
committed
Fix hlint warnings: remove redundant $, use fromMaybe
1 parent 2e85268 commit b370ca5

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

code/drasil-docLang/lib/Drasil/DocumentLanguage.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ fillLC sd si@SI{ _sys = sn }
125125
-- meta-ChunkDB of `drasil-docLang`.
126126
existingLC = findAllLabelledContent chkdb
127127
-- Insert new labelled content into ChunkDB
128-
chkdb2 = insertAll (nub $ createdLCs) chkdb
128+
chkdb2 = insertAll (nub createdLCs) chkdb
129129
si2 = set systemdb chkdb2 si
130130

131131
containsTraceSec :: DocDesc -> Bool

code/drasil-docLang/lib/Drasil/Sections/Requirements.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import Data.Drasil.Concepts.Math (unit_)
3030
import qualified Drasil.DocLang.SRS as SRS
3131
import Drasil.DocumentLanguage.Units (toSentence)
3232
import Data.List (nub)
33+
import Data.Maybe (fromMaybe)
3334

3435
import Control.Lens ((^.))
3536
import Data.Bifunctor (bimap)
@@ -68,7 +69,7 @@ inReq s = cic "inputValues" s "Input-Values" funcReqDom
6869
inReqWTab :: (Quantity i, MayHaveUnit i) => Maybe Sentence -> [i] -> (ConceptInstance, LabelledContent)
6970
inReqWTab mbDesc inputs = (inReq desc, table)
7071
where table = mkInputPropsTable inputs
71-
desc = inReqDesc table $ maybe EmptyS id mbDesc
72+
desc = inReqDesc table $ fromMaybe EmptyS mbDesc
7273

7374
-- | Adds a generalized introduction for a Non-Fucntional Requirements section. Takes in the contents of that section.
7475
fReqF :: [Contents] -> Section

code/drasil-example/glassbr/lib/Drasil/GlassBR/Requirements.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ import Data.Drasil.Concepts.Math (calculation)
1616
import Data.Drasil.Concepts.PhysicalProperties (dimension)
1717
import Data.Drasil.Concepts.Software (errMsg)
1818

19-
import Drasil.DocLang (mkQRTuple, mkQRTupleRef, mkValsSourceTable,
19+
import Drasil.DocLang (inReqWTab, mkQRTuple, mkQRTupleRef, mkValsSourceTable,
2020
mkMaintainableNFR, mkPortableNFR, mkCorrectNFR, mkVerifiableNFR,
2121
mkUnderstandableNFR, mkReusableNFR)
22-
import Drasil.Sections.Requirements (inReqWTab)
2322
import Drasil.DocLang.SRS (datCon)
2423

2524
import Theory.Drasil (DataDefinition)

0 commit comments

Comments
 (0)