[WIP] [corium] update code for async/await etc

Change-Id: I252129661cee25b697868f9fb5a372657940b387
diff --git a/src/sys/wasm_runner/BUILD.gn b/src/sys/wasm_runner/BUILD.gn
index 88e82bf..2a07acd 100644
--- a/src/sys/wasm_runner/BUILD.gn
+++ b/src/sys/wasm_runner/BUILD.gn
@@ -25,7 +25,7 @@
     "//third_party/rust_crates:failure",
     "//third_party/rust_crates:futures-preview",
     "//third_party/rust_crates:serde_json",
-    "//zircon/public/fidl/fuchsia-io:fuchsia-io-rustc",
+    "//zircon/system/fidl/fuchsia-io:fuchsia-io-rustc",
   ]
 }
 
diff --git a/src/sys/wasm_runner/src/main.rs b/src/sys/wasm_runner/src/main.rs
index da88276..260c198 100644
--- a/src/sys/wasm_runner/src/main.rs
+++ b/src/sys/wasm_runner/src/main.rs
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#![feature(async_await, await_macro)]
-
 use failure::{bail, format_err, Error, ResultExt};
 use fidl::endpoints::{create_proxy, ServerEnd};
 use fidl_fuchsia_io::{DirectoryProxy, FileMarker, NodeMarker};
@@ -46,9 +44,9 @@
 
     dir_proxy.open(0, 0, path, ServerEnd::<NodeMarker>::new(server.into_channel()))?;
 
-    let attr = await!(file.get_attr())?.1;
+    let attr = file.get_attr().await?.1;
 
-    let (_, vec) = await!(file.read(attr.content_size))?;
+    let (_, vec) = file.read(attr.content_size).await?;
     Ok(vec)
 }
 
@@ -66,7 +64,7 @@
         mut startup_info,
         controller: _,
         control_handle,
-    }) = await!(stream.try_next()).context("error running server")?
+    }) = stream.try_next().await.context("error running server")?
     {
         fx_log_info!("Received runner request for component {}", package.resolved_url);
 
@@ -79,7 +77,7 @@
 
         fx_log_info!("Found package directory handle");
 
-        let meta_contents = await!(file_contents_at_path(pkg_directory_channel, &manifest_path))?;
+        let meta_contents = file_contents_at_path(pkg_directory_channel, &manifest_path).await?;
 
         fx_log_info!("Meta contents: {:#?}", std::str::from_utf8(&meta_contents)?);
 
@@ -111,7 +109,7 @@
         run_runner_server(stream).unwrap_or_else(|e| println!("{:?}", e))
     });
 
-    await!(fut);
+    fut.await;
     Ok(())
 }