fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 fc-fontations/instance_enumerate.rs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da024118d0a1f55873c9f4ce363194be14888b28
Merge: cbbc890 5b7a0d6
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Jul 22 02:49:56 2025 +0000

    Merge branch 'syncLifetime' into 'main'
    
    Fix rustc warning for mismatching referred lifetimes
    
    Closes #486
    
    See merge request fontconfig/fontconfig!453

commit 5b7a0d6cb4b521912b14ee6cce780f4b26efad10
Author: Dominik Röttsches <drott at chromium.org>
Date:   Mon Jul 21 14:06:15 2025 +0300

    Fix rustc warning for mismatching referred lifetimes
    
    Fixes #486.

diff --git a/fc-fontations/instance_enumerate.rs b/fc-fontations/instance_enumerate.rs
index 89b26fe..5ed6ea1 100644
--- a/fc-fontations/instance_enumerate.rs
+++ b/fc-fontations/instance_enumerate.rs
@@ -31,7 +31,7 @@ use skrifa::MetadataProvider;
 
 pub fn fonts_and_indices(
     file_ref: Option<FileRef>,
-) -> impl Iterator<Item = (FontRef<'_>, Option<i32>)> {
+) -> impl Iterator<Item = (FontRef, Option<i32>)> {
     let (iter_one, iter_two) = match file_ref {
         Some(Font(font)) => (Some((Ok(font.clone()), None)), None),
         Some(Collection(collection)) => (