Switch over await's to surface syntax.

Author: cristianoc

example-async/src/AA.res

@@ -14,17 +14,17 @@ let foo = async (. x, y) => x + y
 let bar =
   async
   (. ff) => {
-    let a = @res.await ff(. 3, 4)
-    let b = @res.await foo(. 5, 6)
+    let a = await ff(. 3, 4)
+    let b = await foo(. 5, 6)
     a + b
   }
 
-let baz = async (. ()) => @res.await bar(. foo)
+let baz = async (. ()) => await bar(. foo)
 
 let testBaz: testable =
   async
   (. ()) => {
-    let n = @res.await baz(.)
+    let n = await baz(.)
     Js.log2("baz returned", n)
   }
 
@@ -38,14 +38,14 @@ exception E(int)
 
 let e1: testable = async (. ()) => raise(E(1000))
 let e2: testable = async (. ()) => Js.Exn.raiseError("Some JS error")
-let e3: testable = async (. ()) => @res.await e1(.)
-let e4: testable = async (. ()) => @res.await e2(.)
+let e3: testable = async (. ()) => await e1(.)
+let e4: testable = async (. ()) => await e2(.)
 let e5: testable = %raw(`function() { return Promise.reject(new Error('fail')) }`)
 
 let testTryCatch =
   async
   (. fn) =>
-    try {@res.await fn(.)} catch {
+    try {await fn(.)} catch {
     | E(n) => Js.log2("testTryCatch: E", n)
     | JsError(_) => Js.log("testTryCatch: JsError")
     }
@@ -87,7 +87,7 @@ let testFetch =
   async
   (. url) => {
     open Fetch
-    switch {@res.await fetch(url)} {
+    switch {await fetch(url)} {
     | response =>
       let status = response->status
       Js.log2("Fetch returned status:", status)
@@ -104,11 +104,11 @@ testFetch->addTest1("https://www.google.comsdkjdkghdsg")
 let withCallback =
   async
   (. ()) => {
-    async (. x) => @res.await (x->Js.Promise.resolve) + 1
+    async (. x) => await (x->Js.Promise.resolve) + 1
   }
 
 let testWithCallback =
-  async (. ()) => Js.log2("callback returned", @res.await (@res.await withCallback(.))(. 3))
+  async (. ()) => Js.log2("callback returned", await (await withCallback(.))(. 3))
 
 testWithCallback->addTest
 
@@ -124,10 +124,10 @@ module AsyncList = {
         (. l, acc) =>
           switch l {
           | list{} => acc
-          | list{p, ...rest} => @res.await loop(. rest, list{@res.await p, ...acc})
+          | list{p, ...rest} => await loop(. rest, list{await p, ...acc})
           }
 
-      @res.await
+      await
       loop(. l->Belt.List.mapReverse(x => f(. x)), list{})
     }
 }
@@ -138,7 +138,7 @@ let fetchAndCount = {
   let ff =
     async
     (. url) => {
-      let response = @res.await Fetch.fetch(url)
+      let response = await Fetch.fetch(url)
       counter := counter.contents + 1
       (counter.contents, response->Fetch.status)
     }
@@ -150,7 +150,7 @@ let testFetchMany =
   async
   (. ()) => {
     let fetchedItems =
-      @res.await
+      await
       AsyncList.map(.
         list{
           "https://www.google.com",
@@ -172,7 +172,7 @@ module FetchResult = {
   let fetch =
     async
     (. url) => {
-      switch {@res.await Fetch.fetch(url)} {
+      switch {await Fetch.fetch(url)} {
       | response => Ok(response)
       | exception JsError(e) => Error(e)
       }
@@ -184,14 +184,14 @@ let nextFetch = (. _response) => Some("https://github.com/")
 let testFetchWithResult =
   async
   (. ()) => {
-    switch @res.await
+    switch await
     FetchResult.fetch(. "https://www.google.com") {
     | Ok(response1) =>
       Js.log2("FetchResult response1", response1->Fetch.status)
       switch nextFetch(. response1) {
       | None => ()
       | Some(url) =>
-        switch @res.await
+        switch await
         FetchResult.fetch(. url) {
         | Ok(response2) => Js.log2("FetchResult response2", response2->Fetch.status)
         | Error(_) => ()
@@ -219,10 +219,10 @@ let rec runAllTests =
   async
   (. n) => {
     if n >= 0 && n < Array.length(tests) {
-      @res.await
+      await
       (@doesNotRaise tests[n])(.)
 
-      @res.await
+      await
       runAllTests(. n + 1)
     }
   }
@@ -233,13 +233,13 @@ runAllTests(. 0)->ignore
 //
 // Curried functions
 
-let bb = async x => @res.await x
+let bb = async x => await x
 
-let cc = async (x, ~y=x, z) => (@res.await x) + (@res.await y) + (@res.await z)
+let cc = async (x, ~y=x, z) => (await x) + (await y) + (await z)
 
-let dd = async x => {y => (@res.await x) + (@res.await y)}
+let dd = async x => {y => (await x) + (await y)}
 
-let ee = async (. x) => {y => (@res.await x) + (@res.await y)}
+let ee = async (. x) => {y => (await x) + (await y)}
 
 //
 //
@@ -248,8 +248,8 @@ let ee = async (. x) => {y => (@res.await x) + (@res.await y)}
 // let aa =
 //   async
 //   (. x) => {
-//     let cb = (. _) => @res.await x // Error: Await on expression not in an async context
+//     let cb = (. _) => await x // Error: Await on expression not in an async context
 //     cb
 //   }
 
-// let _ = async (_, . x) => @res.await x // Error: Await on expression not in an async context
+// let _ = async (_, . x) => await x // Error: Await on expression not in an async context