Bump to Rust 2021 edition

1Password · Nov 22, 2023 · a86e4d7 · a86e4d7
1 parent 9182184
commit a86e4d7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/1Password/arboard"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 keywords = ["clipboard", "image"]
-edition = "2018"
+edition = "2021"
 rust-version = "1.61"
 
 [features]

diff --git a/src/platform/linux/mod.rs b/src/platform/linux/mod.rs
@@ -13,7 +13,7 @@ mod x11;
 mod wayland;
 
 fn into_unknown<E: std::fmt::Display>(error: E) -> Error {
-	Error::Unknown { description: format!("{}", error) }
+	Error::Unknown { description: error.to_string() }
 }
 
 #[cfg(feature = "image-data")]

diff --git a/src/platform/linux/wayland.rs b/src/platform/linux/wayland.rs
@@ -71,7 +71,7 @@ impl Clipboard {
 
 			Err(PasteError::PrimarySelectionUnsupported) => Err(Error::ClipboardNotSupported),
 
-			Err(err) => Err(Error::Unknown { description: format!("{}", err) }),
+			Err(err) => Err(Error::Unknown { description: err.to_string() }),
 		}
 	}
 
@@ -154,7 +154,7 @@ impl Clipboard {
 				Err(Error::ContentNotAvailable)
 			}
 
-			Err(err) => Err(Error::Unknown { description: format!("{}", err) }),
+			Err(err) => Err(Error::Unknown { description: err.to_string() }),
 		}
 	}
 

diff --git a/src/platform/osx.rs b/src/platform/osx.rs
@@ -282,8 +282,7 @@ impl<'clipboard> Set<'clipboard> {
 		// https://bugzilla.mozilla.org/show_bug.cgi?id=466599
 		// https://bugs.chromium.org/p/chromium/issues/detail?id=11957
 		let html = format!(
-			r#"<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>{}</body></html>"#,
-			html
+			r#"<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>{html}</body></html>"#,
 		);
 		let html_nss = NSString::from_str(&html);
 		// Make sure that we pass a pointer to the string and not the object itself.

diff --git a/src/platform/windows.rs b/src/platform/windows.rs
@@ -554,7 +554,7 @@ impl<'clipboard> Set<'clipboard> {
 
 		if let Err(e) = clipboard_win::raw::empty() {
 			return Err(Error::Unknown {
-				description: format!("Failed to empty the clipboard. Got error code: {}", e),
+				description: format!("Failed to empty the clipboard. Got error code: {e}"),
 			});
 		};