Upgrade dependencies, MSRV, and various cleanups.

Author: felixc

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [NEXT] - Unreleased
+  * Require Rust 1.56 as the minimum supported language version.
+  * Adopt 2021 edition of the language.
+  * Dependency upgrades.
+
 ## [v0.9.1] - 2020-07-12
   * Fixed build failure on arm32 due to invalid assumptions about int size.
   * Fixed null pointer crash when using `get_tag_raw()`.

Cargo.toml

@@ -17,7 +17,8 @@ keywords = ["metadata", "exif", "iptc", "xmp", "photo"]
 categories = ["multimedia::images"]
 readme = "README.md"
 
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 include = [
   "Cargo.toml",
@@ -29,10 +30,10 @@ include = [
 ]
 
 [dependencies]
-gexiv2-sys = "^1.1.1"
+gexiv2-sys = "1.2"
 libc = "0.2"
-num-rational = { version = "0.2", default-features = false }
-glib-sys = { version = "0.9", optional = true }
+num-rational = { version = "0.4", default-features = false }
+glib-sys = { version = "0.15", optional = true }
 
 [features]
 raw-tag-access = ["gexiv2-sys/raw-tag-access", "glib-sys"]

README.md

@@ -18,10 +18,10 @@ rexiv2
 Rust library for working with media file metadata
 -------------------------------------------------
 
-This library provides a Rust wrapper around the [gexiv2][gexiv2] library,
-which is a GObject-based wrapper around the [Exiv2][exiv2] library, which
-provides read and write access to the Exif, XMP, and IPTC metadata in media
-files (typically photos) in various formats.
+This crate provides a Rust wrapper around the [gexiv2][gexiv2] library, which is
+a GObject-based wrapper around [Exiv2][exiv2], which provides read and write
+access to the Exif, XMP, and IPTC metadata in media files (typically photos) in
+various formats.
 
 [gexiv2]: https://wiki.gnome.org/Projects/gexiv2
 [exiv2]:  http://www.exiv2.org/
@@ -50,7 +50,7 @@ come in handy.
 Setup & Dependencies
 --------------------
 
-rexiv2 requires Rust 1.31 or newer, and uses the 2018 edition of the language.
+rexiv2 requires Rust 1.56 or newer, and uses the 2021 edition of the language.
 
 Being a wrapper for gexiv2 and Exiv2, rexiv2 obviously depends on them. These
 libraries are not bundled with rexiv2: you will need to install them separately.
@@ -61,10 +61,11 @@ For full instructions on how to get started with rexiv2, including how to
 install the prerequisite dependencies, refer to the [`SETUP`](SETUP.md) file.
 
 Note that if you want BMFF support (e.g. HEIC, HEIF, AVIF, CR3, JXL/bmff files)
-you will need an up to date version of the underlying libraries (gexiv2 v0.13.0 and Exiv2 v0.27.4).
-You will also need to ensure that your version of Exiv2 has BMFF support enabled.
-This is generally enabled by default, but may be switched off in certain distributions
-due to licensing issues.
+you will need an up-to-date version of the underlying libraries (at least gexiv2
+v0.13.0 and Exiv2 v0.27.4). You will also need to ensure that your version of
+Exiv2 has BMFF support enabled. This is generally enabled by default, but may be
+switched off in certain distributions due to licensing issues.
+
 
 Versioning & History
 --------------------

SETUP.md

@@ -94,7 +94,7 @@ adding a dependency on rexiv2 in your crate’s `Cargo.toml` file:
 
 ```toml
 [dependencies]
-rexiv2 = "0.9.1"
+rexiv2 = "0.10"
 ```
 
 Alternatively, if you’d like to work off of the bleeding edge (note that this is

src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright © 2015–2020 Felix A. Crux <[email protected]> and CONTRIBUTORS
+// Copyright © 2015–2022 Felix A. Crux <[email protected]> and CONTRIBUTORS
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -1033,21 +1033,38 @@ pub fn get_tag_type(tag: &str) -> Result<TagType> {
 ///
 /// # See also
 ///
-/// Associated Gexiv2 Source Code: https://gitlab.gnome.org/GNOME/gexiv2/-/blob/e4d65b31cd77f28ef248117e161de9d8cc31d712/gexiv2/gexiv2-startup.cpp#L14
+/// Associated Gexiv2 source code: https://gitlab.gnome.org/GNOME/gexiv2/-/blob/e4d65b31cd77f28ef248117e161de9d8cc31d712/gexiv2/gexiv2-startup.cpp#L14
 ///
 /// # Examples
 ///
-/// Simple call at the start of the application
+/// It is normally sufficient to simply call the function in the usual
+/// obvious way:
 ///
 /// ```
 /// fn main() {
 ///     rexiv2::initialize().expect("Unable to initialize rexiv2");
 /// }
 /// ```
+///
+/// However if you have a more complex multi-threaded environment, you
+/// might want to ensure the function only gets set up once:
+///
+/// ```
+/// use std::sync::{Once, ONCE_INIT};
+///
+/// fn main() {
+///     static START: Once = ONCE_INIT;
+///
+///     START.call_once(|| unsafe {
+///         rexiv2::initialize().expect("Unable to initialize rexiv2");
+///     });
+/// }
+/// ```
 pub fn initialize() -> Result<()> {
     unsafe { int_bool_to_result(gexiv2::gexiv2_initialize()) }
 }
 
+
 // XMP namespace management.
 
 /// Add a new XMP namespace for tags to exist under.

tst/main.rs

@@ -1,4 +1,4 @@
-// Copyright © 2016–2020 Felix A. Crux <[email protected]> and CONTRIBUTORS
+// Copyright © 2016–2022 Felix A. Crux <[email protected]> and CONTRIBUTORS
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -21,14 +21,7 @@ use std::sync::Once;
 
 static INIT: Once = Once::new();
 
-///
 /// Should be called before any test runs. Will ensure that the library is initialized at most once.
-/// This would be the equivalent of a "beforeAll" function in other test libraries.
-///
-/// Future work: At some strange it might be good to work out if this can be done automatically
-/// by the test runner. It doesn't seem to be right now with the stock cargo test runner but
-/// it might be possible with 3rd party crates.
-///
 fn setup_test() {
     INIT.call_once(|| rexiv2::initialize().expect("Unable to initialize rexiv2"));
 }