chore: MSRV 1.70

.gitignore

@@ -21,7 +21,8 @@ examples/test*.png
 *.ipr
 *.iws
 .idea/
+.DS_Store
 
 # Do not check Visual Studio Code-specific files into source control
 
-*.code-workspace
+*.code-workspace

Cargo.toml

@@ -2,7 +2,7 @@
 name = "pdfium-render"
 version = "0.8.25"
 edition = "2018"
-rust-version = "1.60"
+rust-version = "1.70"
 publish = true
 description = "A high-level idiomatic Rust wrapper around Pdfium, the C++ PDF library used by the Google Chromium project."
 readme = "README.md"
@@ -23,8 +23,8 @@ doctest = false
 bitflags = "2"
 bytes = "1"
 bytemuck = "1"
-chrono = "0.4, <= 0.4.31"                          # To meet crate MSRV target of Rust 1.60.
-image = { version = ">= 0.24.0", optional = true } # DynamicImage trait definitions changed between 0.23.14 and 0.24.0; we use trait from version 0.24.0 and later.
+chrono = "0.4"
+image = { version = "0.25.0", optional = true }
 itertools = "0"
 log = "0"
 maybe-owned = "0"
@@ -53,9 +53,7 @@ libloading = "0"
 windows = { version = "0", optional = true }
 
 [build-dependencies]
-# Bindgen 0.70.0 and later cause build failures when compiling to WASM. For more details, see:
-# 
-bindgen = { version = "<=0.69.4", optional = true }
+bindgen = { version = "0.70.0", optional = true }
 
 [dev-dependencies]
 # Dependencies specific to examples. Dependencies for the WASM example in examples/wasm.rs

include/pdfium_5961/rust-import-wrapper.h

@@ -1,22 +1,22 @@
-#include "fpdf_edit.h"
-#include "fpdf_text.h"
-#include "fpdf_annot.h"
-#include "fpdf_fwlevent.h"
+#include "fpdf_catalog.h"
 #include "fpdf_structtree.h"
-#include "fpdf_progressive.h"
-#include "fpdf_dataavail.h"
+#include "fpdf_text.h"
 #include "fpdf_doc.h"
-#include "fpdf_thumbnail.h"
-#include "fpdf_signature.h"
-#include "fpdf_ppo.h"
-#include "fpdf_searchex.h"
-#include "fpdf_attachment.h"
-#include "fpdf_sysfontinfo.h"
+#include "fpdf_edit.h"
+#include "fpdf_transformpage.h"
+#include "fpdf_fwlevent.h"
 #include "fpdfview.h"
-#include "fpdf_save.h"
-#include "fpdf_formfill.h"
+#include "fpdf_annot.h"
+#include "fpdf_ppo.h"
 #include "fpdf_javascript.h"
-#include "fpdf_ext.h"
-#include "fpdf_catalog.h"
 #include "fpdf_flatten.h"
-#include "fpdf_transformpage.h"
+#include "fpdf_save.h"
+#include "fpdf_sysfontinfo.h"
+#include "fpdf_attachment.h"
+#include "fpdf_searchex.h"
+#include "fpdf_ext.h"
+#include "fpdf_signature.h"
+#include "fpdf_formfill.h"
+#include "fpdf_progressive.h"
+#include "fpdf_dataavail.h"
+#include "fpdf_thumbnail.h"

include/pdfium_6015/rust-import-wrapper.h

@@ -1,22 +1,22 @@
-#include "fpdf_thumbnail.h"
-#include "fpdf_javascript.h"
-#include "fpdf_save.h"
-#include "fpdf_ppo.h"
-#include "fpdf_doc.h"
+#include "fpdf_catalog.h"
 #include "fpdf_structtree.h"
+#include "fpdf_text.h"
+#include "fpdf_doc.h"
 #include "fpdf_edit.h"
-#include "fpdf_attachment.h"
 #include "fpdf_transformpage.h"
-#include "fpdf_catalog.h"
 #include "fpdf_fwlevent.h"
-#include "fpdf_ext.h"
 #include "fpdfview.h"
+#include "fpdf_annot.h"
+#include "fpdf_ppo.h"
+#include "fpdf_javascript.h"
 #include "fpdf_flatten.h"
+#include "fpdf_save.h"
 #include "fpdf_sysfontinfo.h"
-#include "fpdf_progressive.h"
-#include "fpdf_annot.h"
+#include "fpdf_attachment.h"
+#include "fpdf_searchex.h"
+#include "fpdf_ext.h"
 #include "fpdf_signature.h"
-#include "fpdf_text.h"
-#include "fpdf_dataavail.h"
 #include "fpdf_formfill.h"
-#include "fpdf_searchex.h"
+#include "fpdf_progressive.h"
+#include "fpdf_dataavail.h"
+#include "fpdf_thumbnail.h"

include/pdfium_6043/rust-import-wrapper.h

@@ -1,22 +1,22 @@
-#include "fpdf_searchex.h"
+#include "fpdf_catalog.h"
+#include "fpdf_structtree.h"
+#include "fpdf_text.h"
+#include "fpdf_doc.h"
+#include "fpdf_edit.h"
 #include "fpdf_transformpage.h"
-#include "fpdf_ppo.h"
-#include "fpdf_signature.h"
 #include "fpdf_fwlevent.h"
 #include "fpdfview.h"
-#include "fpdf_thumbnail.h"
-#include "fpdf_progressive.h"
-#include "fpdf_catalog.h"
-#include "fpdf_javascript.h"
-#include "fpdf_sysfontinfo.h"
-#include "fpdf_attachment.h"
 #include "fpdf_annot.h"
-#include "fpdf_doc.h"
+#include "fpdf_ppo.h"
+#include "fpdf_javascript.h"
 #include "fpdf_flatten.h"
-#include "fpdf_text.h"
-#include "fpdf_edit.h"
 #include "fpdf_save.h"
+#include "fpdf_sysfontinfo.h"
+#include "fpdf_attachment.h"
+#include "fpdf_searchex.h"
+#include "fpdf_ext.h"
+#include "fpdf_signature.h"
 #include "fpdf_formfill.h"
+#include "fpdf_progressive.h"
 #include "fpdf_dataavail.h"
-#include "fpdf_structtree.h"
-#include "fpdf_ext.h"
+#include "fpdf_thumbnail.h"

include/pdfium_6084/rust-import-wrapper.h

@@ -1,22 +1,22 @@
-#include "fpdf_dataavail.h"
+#include "fpdf_catalog.h"
 #include "fpdf_structtree.h"
-#include "fpdf_sysfontinfo.h"
-#include "fpdf_attachment.h"
+#include "fpdf_text.h"
+#include "fpdf_doc.h"
+#include "fpdf_edit.h"
+#include "fpdf_transformpage.h"
+#include "fpdf_fwlevent.h"
+#include "fpdfview.h"
+#include "fpdf_annot.h"
+#include "fpdf_ppo.h"
 #include "fpdf_javascript.h"
-#include "fpdf_formfill.h"
 #include "fpdf_flatten.h"
 #include "fpdf_save.h"
-#include "fpdf_annot.h"
+#include "fpdf_sysfontinfo.h"
+#include "fpdf_attachment.h"
 #include "fpdf_searchex.h"
-#include "fpdf_text.h"
-#include "fpdf_transformpage.h"
-#include "fpdf_catalog.h"
-#include "fpdf_doc.h"
-#include "fpdf_ppo.h"
-#include "fpdf_progressive.h"
-#include "fpdf_edit.h"
-#include "fpdf_signature.h"
 #include "fpdf_ext.h"
-#include "fpdfview.h"
-#include "fpdf_fwlevent.h"
+#include "fpdf_signature.h"
+#include "fpdf_formfill.h"
+#include "fpdf_progressive.h"
+#include "fpdf_dataavail.h"
 #include "fpdf_thumbnail.h"

include/pdfium_6110/rust-import-wrapper.h

@@ -1,22 +1,22 @@
 #include "fpdf_catalog.h"
-#include "fpdf_flatten.h"
-#include "fpdf_formfill.h"
-#include "fpdf_javascript.h"
+#include "fpdf_structtree.h"
+#include "fpdf_text.h"
+#include "fpdf_doc.h"
+#include "fpdf_edit.h"
+#include "fpdf_transformpage.h"
+#include "fpdf_fwlevent.h"
+#include "fpdfview.h"
+#include "fpdf_annot.h"
 #include "fpdf_ppo.h"
+#include "fpdf_javascript.h"
+#include "fpdf_flatten.h"
+#include "fpdf_save.h"
 #include "fpdf_sysfontinfo.h"
 #include "fpdf_attachment.h"
-#include "fpdf_fwlevent.h"
-#include "fpdfview.h"
-#include "fpdf_progressive.h"
 #include "fpdf_searchex.h"
-#include "fpdf_edit.h"
-#include "fpdf_structtree.h"
-#include "fpdf_signature.h"
-#include "fpdf_doc.h"
 #include "fpdf_ext.h"
-#include "fpdf_save.h"
-#include "fpdf_transformpage.h"
-#include "fpdf_text.h"
-#include "fpdf_annot.h"
+#include "fpdf_signature.h"
+#include "fpdf_formfill.h"
+#include "fpdf_progressive.h"
 #include "fpdf_dataavail.h"
 #include "fpdf_thumbnail.h"

include/pdfium_6124/rust-import-wrapper.h

@@ -1,22 +1,22 @@
-#include "fpdf_formfill.h"
-#include "fpdf_transformpage.h"
-#include "fpdf_text.h"
-#include "fpdf_attachment.h"
 #include "fpdf_catalog.h"
-#include "fpdf_annot.h"
+#include "fpdf_structtree.h"
+#include "fpdf_text.h"
 #include "fpdf_doc.h"
-#include "fpdf_searchex.h"
-#include "fpdf_sysfontinfo.h"
-#include "fpdf_javascript.h"
-#include "fpdf_ext.h"
-#include "fpdf_ppo.h"
-#include "fpdf_progressive.h"
+#include "fpdf_edit.h"
+#include "fpdf_transformpage.h"
 #include "fpdf_fwlevent.h"
+#include "fpdfview.h"
+#include "fpdf_annot.h"
+#include "fpdf_ppo.h"
+#include "fpdf_javascript.h"
 #include "fpdf_flatten.h"
-#include "fpdf_dataavail.h"
-#include "fpdf_edit.h"
 #include "fpdf_save.h"
+#include "fpdf_sysfontinfo.h"
+#include "fpdf_attachment.h"
+#include "fpdf_searchex.h"
+#include "fpdf_ext.h"
 #include "fpdf_signature.h"
-#include "fpdf_structtree.h"
-#include "fpdfview.h"
+#include "fpdf_formfill.h"
+#include "fpdf_progressive.h"
+#include "fpdf_dataavail.h"
 #include "fpdf_thumbnail.h"

include/pdfium_6164/rust-import-wrapper.h

@@ -1,22 +1,22 @@
-#include "fpdf_progressive.h"
 #include "fpdf_catalog.h"
-#include "fpdf_doc.h"
-#include "fpdf_fwlevent.h"
-#include "fpdf_sysfontinfo.h"
 #include "fpdf_structtree.h"
-#include "fpdf_searchex.h"
-#include "fpdf_javascript.h"
-#include "fpdf_signature.h"
-#include "fpdf_dataavail.h"
+#include "fpdf_text.h"
+#include "fpdf_doc.h"
+#include "fpdf_edit.h"
 #include "fpdf_transformpage.h"
+#include "fpdf_fwlevent.h"
+#include "fpdfview.h"
 #include "fpdf_annot.h"
-#include "fpdf_save.h"
+#include "fpdf_ppo.h"
+#include "fpdf_javascript.h"
 #include "fpdf_flatten.h"
-#include "fpdf_edit.h"
-#include "fpdfview.h"
+#include "fpdf_save.h"
+#include "fpdf_sysfontinfo.h"
 #include "fpdf_attachment.h"
-#include "fpdf_ppo.h"
-#include "fpdf_formfill.h"
-#include "fpdf_text.h"
+#include "fpdf_searchex.h"
 #include "fpdf_ext.h"
+#include "fpdf_signature.h"
+#include "fpdf_formfill.h"
+#include "fpdf_progressive.h"
+#include "fpdf_dataavail.h"
 #include "fpdf_thumbnail.h"

include/pdfium_6259/rust-import-wrapper.h

@@ -1,22 +1,22 @@
-#include "fpdf_text.h"
+#include "fpdf_catalog.h"
 #include "fpdf_structtree.h"
-#include "fpdf_progressive.h"
-#include "fpdfview.h"
-#include "fpdf_sysfontinfo.h"
-#include "fpdf_ppo.h"
-#include "fpdf_thumbnail.h"
-#include "fpdf_dataavail.h"
+#include "fpdf_text.h"
 #include "fpdf_doc.h"
-#include "fpdf_annot.h"
-#include "fpdf_transformpage.h"
-#include "fpdf_searchex.h"
-#include "fpdf_ext.h"
 #include "fpdf_edit.h"
-#include "fpdf_catalog.h"
+#include "fpdf_transformpage.h"
 #include "fpdf_fwlevent.h"
+#include "fpdfview.h"
+#include "fpdf_annot.h"
+#include "fpdf_ppo.h"
+#include "fpdf_javascript.h"
+#include "fpdf_flatten.h"
+#include "fpdf_save.h"
+#include "fpdf_sysfontinfo.h"
 #include "fpdf_attachment.h"
+#include "fpdf_searchex.h"
+#include "fpdf_ext.h"
 #include "fpdf_signature.h"
 #include "fpdf_formfill.h"
-#include "fpdf_javascript.h"
-#include "fpdf_flatten.h"
-#include "fpdf_save.h"
+#include "fpdf_progressive.h"
+#include "fpdf_dataavail.h"
+#include "fpdf_thumbnail.h"

include/pdfium_6295/rust-import-wrapper.h

@@ -1,22 +1,22 @@
+#include "fpdf_catalog.h"
+#include "fpdf_structtree.h"
+#include "fpdf_text.h"
+#include "fpdf_doc.h"
 #include "fpdf_edit.h"
+#include "fpdf_transformpage.h"
 #include "fpdf_fwlevent.h"
-#include "fpdf_ppo.h"
-#include "fpdf_text.h"
-#include "fpdf_progressive.h"
-#include "fpdf_ext.h"
-#include "fpdf_formfill.h"
-#include "fpdf_flatten.h"
-#include "fpdf_signature.h"
-#include "fpdf_attachment.h"
 #include "fpdfview.h"
+#include "fpdf_annot.h"
+#include "fpdf_ppo.h"
 #include "fpdf_javascript.h"
+#include "fpdf_flatten.h"
 #include "fpdf_save.h"
-#include "fpdf_transformpage.h"
-#include "fpdf_structtree.h"
-#include "fpdf_thumbnail.h"
+#include "fpdf_sysfontinfo.h"
+#include "fpdf_attachment.h"
 #include "fpdf_searchex.h"
+#include "fpdf_ext.h"
+#include "fpdf_signature.h"
+#include "fpdf_formfill.h"
+#include "fpdf_progressive.h"
 #include "fpdf_dataavail.h"
-#include "fpdf_sysfontinfo.h"
-#include "fpdf_doc.h"
-#include "fpdf_catalog.h"
-#include "fpdf_annot.h"
+#include "fpdf_thumbnail.h"