Merge branch 'aische-master'

arturopala · Nov 16, 2016 · 67a5da9 · 67a5da9
2 parents c64c833 + 48fe937
commit 67a5da9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/elm-package.json b/elm-package.json
@@ -15,7 +15,7 @@
  "Monocle.Common"
  ],
  "dependencies": {
- "elm-lang/core": "4.0.1 <= v < 5.0.0"
+ "elm-lang/core": "5.0.0 <= v < 6.0.0"
  },
- "elm-version": "0.17.0 <= v < 0.18.0"
+ "elm-version": "0.18.0 <= v < 0.19.0"
 }
diff --git a/example/OptionalExample.elm b/example/OptionalExample.elm
@@ -67,12 +67,12 @@ streetNameOfAddress =
 
 regionOfPlace : Optional Place String
 regionOfPlace =
- addressOfPlace `Monocle.Optional.compose` regionOfAddress
+ Monocle.Optional.compose addressOfPlace regionOfAddress
 
 
 streetNameOfPlace : Optional Place String
 streetNameOfPlace =
- addressOfPlace `Monocle.Optional.composeLens` streetNameOfAddress
+ Monocle.Optional.composeLens addressOfPlace streetNameOfAddress
 
 
 place : Place

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
  },
  "homepage": "https://github.com/arturopala/elm-monocle#readme",
  "devDependencies": {
- "elm": "^0.17.0",
+ "elm": "^0.18.0",
  "elm-test":"^0.16.0",
  "onchange": "^2.0.0",
  "ws": "^1.0.1"

diff --git a/src/Monocle/Common.elm b/src/Monocle/Common.elm
@@ -109,7 +109,7 @@ id =
 -}
 first : Lens ( a, b ) a
 first =
- { get = fst
+ { get = Tuple.first
  , set = \a ( _, b ) -> ( a, b )
  }
 
@@ -121,6 +121,6 @@ first =
 -}
 second : Lens ( a, b ) b
 second =
- { get = snd
+ { get = Tuple.second
  , set = \b ( a, _ ) -> ( a, b )
  }
diff --git a/src/Monocle/Optional.elm b/src/Monocle/Optional.elm
@@ -157,14 +157,11 @@ zip left right =
  let
  getOption ( a, b ) =
  left.getOption a
- |> (\ma ->
- Maybe.andThen
- ma
- (\c ->
- right.getOption b
- |> Maybe.map (\d -> ( c, d ))
- )
- )
+ |> Maybe.andThen
+ (\c ->
+ right.getOption b
+ |> Maybe.map (\d -> ( c, d ))
+ )
 
  set ( c, d ) ( a, b ) =
  ( left.set c a, right.set d b )