Upgrade SNAFU to 0.7

Cargo.toml

@@ -27,7 +27,7 @@ rusoto_credential = "0.47.0"
 rusoto_ebs = { version = "0.47.0", default-features = false }
 rusoto_ec2 = { version = "0.47.0", default-features = false }
 rusoto_signature = "0.47.0"
-snafu = "0.6.9"
+snafu = "0.7"
 indicatif = "0.16.2"
 tempfile = "3.1.0"
 async-trait = "0.1.50"

src/bin/coldsnap/client.rs

@@ -7,10 +7,10 @@ this should cover most scenarios.
 /// Create a rusoto client of the given type using the (optional) given region, endpoint, and credentials.
 macro_rules! build_client {
     ($client_type:ty, $region_name:expr, $endpoint:expr, $profile:expr) => {{
-        let http_client = HttpClient::new().context(error::CreateHttpClient)?;
+        let http_client = HttpClient::new().context(error::CreateHttpClientSnafu)?;
         let profile_provider = match $profile {
             Some(profile) => {
-                let mut p = ProfileProvider::new().context(error::CreateProfileProvider)?;
+                let mut p = ProfileProvider::new().context(error::CreateProfileProviderSnafu)?;
                 p.set_profile(profile);
                 Some(p)
             }
@@ -23,7 +23,7 @@ macro_rules! build_client {
 
         fn parse_region(region: Option<String>) -> Result<Option<Region>> {
             region
-                .map(|r| r.parse().context(error::ParseRegion { region: r }))
+                .map(|r| r.parse().context(error::ParseRegionSnafu { region: r }))
                 .transpose()
         }
 

src/bin/coldsnap/main.rs

@@ -41,13 +41,13 @@ async fn run() -> Result<()> {
             let downloader = SnapshotDownloader::new(client);
             ensure!(
                 download_args.file.file_name().is_some(),
-                error::ValidateFilename {
+                error::ValidateFilenameSnafu {
                     path: download_args.file
                 }
             );
             ensure!(
                 download_args.force || !download_args.file.exists(),
-                error::FileExists {
+                error::FileExistsSnafu {
                     path: download_args.file
                 }
             );
@@ -60,7 +60,7 @@ async fn run() -> Result<()> {
                     progress_bar,
                 )
                 .await
-                .context(error::DownloadSnapshot)?;
+                .context(error::DownloadSnapshotSnafu)?;
         }
 
         SubCommand::Upload(upload_args) => {
@@ -80,15 +80,15 @@ async fn run() -> Result<()> {
                     progress_bar,
                 )
                 .await
-                .context(error::UploadSnapshot)?;
+                .context(error::UploadSnapshotSnafu)?;
             println!("{}", snapshot_id);
             if upload_args.wait {
                 let client = build_client!(Ec2Client, args.region, args.endpoint, args.profile)?;
                 let waiter = SnapshotWaiter::new(client);
                 waiter
                     .wait_for_completed(&snapshot_id)
                     .await
-                    .context(error::WaitSnapshot)?;
+                    .context(error::WaitSnapshotSnafu)?;
             }
         }
 
@@ -104,7 +104,7 @@ async fn run() -> Result<()> {
             waiter
                 .wait(wait_args.snapshot_id, wait_params)
                 .await
-                .context(error::WaitSnapshot)?;
+                .context(error::WaitSnapshotSnafu)?;
         }
     }
     Ok(())
@@ -232,7 +232,7 @@ mod error {
     use snafu::Snafu;
 
     #[derive(Debug, Snafu)]
-    #[snafu(visibility = "pub(super)")]
+    #[snafu(visibility(pub(super)))]
     pub(super) enum Error {
         #[snafu(display("Failed to create HTTP client: {}", source))]
         CreateHttpClient {

src/block_device.rs

@@ -26,15 +26,15 @@ pub(crate) fn get_block_device_size(path: &Path) -> Result<i64> {
     let file = OpenOptions::new()
         .read(true)
         .open(path)
-        .context(error::OpenFile { path })?;
+        .context(error::OpenFileSnafu { path })?;
 
     let mut block_device_size = 0;
     let result = unsafe { ioctl::blkgetsize64(file.as_raw_fd(), &mut block_device_size) }
-        .context(error::GetBlockDeviceSize { path })?;
-    ensure!(result == 0, error::InvalidBlockDeviceSize { result });
+        .context(error::GetBlockDeviceSizeSnafu { path })?;
+    ensure!(result == 0, error::InvalidBlockDeviceSizeSnafu { result });
 
     let block_device_size =
-        i64::try_from(block_device_size).with_context(|| error::ConvertNumber {
+        i64::try_from(block_device_size).with_context(|_| error::ConvertNumberSnafu {
             what: "block device size",
             number: block_device_size.to_string(),
             target: "i64",
@@ -48,7 +48,7 @@ mod error {
     use std::path::PathBuf;
 
     #[derive(Debug, Snafu)]
-    #[snafu(visibility = "pub(super)")]
+    #[snafu(visibility(pub(super)))]
     pub(super) enum Error {
         #[snafu(display("Failed to open '{}': {}", path.display(), source))]
         OpenFile {