regen

GuillaumeGomez · bilelmoussaoui · commit 6e898d653b6b · 2022-11-17T10:12:18.000+01:00
diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gdk4-wayland/sys/versions.txt b/gdk4-wayland/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gdk4-win32/src/auto/versions.txt b/gdk4-win32/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gdk4-win32/sys/tests/abi.rs b/gdk4-win32/sys/tests/abi.rs
@@ -40,7 +40,7 @@ impl Compiler {
         cmd.arg(out);
         let status = cmd.spawn()?.wait()?;
         if !status.success() {
-            return Err(format!("compilation command {:?} failed, {}", &cmd, status).into());
+            return Err(format!("compilation command {cmd:?} failed, {status}").into());
         }
         Ok(())
     }
@@ -56,7 +56,7 @@ fn get_var(name: &str, default: &str) -> Result<Vec<String>, Box<dyn Error>> {
     match env::var(name) {
         Ok(value) => Ok(shell_words::split(&value)?),
         Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?),
-        Err(err) => Err(format!("{} {}", name, err).into()),
+        Err(err) => Err(format!("{name} {err}").into()),
     }
 }
 
@@ -70,7 +70,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     cmd.args(packages);
     let out = cmd.output()?;
     if !out.status.success() {
-        return Err(format!("command {:?} returned {}", &cmd, out.status).into());
+        return Err(format!("command {cmd:?} returned {}", out.status).into());
     }
     let stdout = str::from_utf8(&out.stdout)?;
     Ok(shell_words::split(stdout.trim())?)
@@ -126,15 +126,14 @@ fn cross_validate_constants_with_c() {
     {
         if rust_name != c_name {
             results.record_failed();
-            eprintln!("Name mismatch:\nRust: {:?}\nC:    {:?}", rust_name, c_name,);
+            eprintln!("Name mismatch:\nRust: {rust_name:?}\nC:    {c_name:?}");
             continue;
         }
 
         if rust_value != c_value {
             results.record_failed();
             eprintln!(
-                "Constant value mismatch for {}\nRust: {:?}\nC:    {:?}",
-                rust_name, rust_value, &c_value
+                "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC:    {c_value:?}",
             );
             continue;
         }
@@ -164,16 +163,13 @@ fn cross_validate_layout_with_c() {
     {
         if rust_name != c_name {
             results.record_failed();
-            eprintln!("Name mismatch:\nRust: {:?}\nC:    {:?}", rust_name, c_name,);
+            eprintln!("Name mismatch:\nRust: {rust_name:?}\nC:    {c_name:?}");
             continue;
         }
 
         if rust_layout != c_layout {
             results.record_failed();
-            eprintln!(
-                "Layout mismatch for {}\nRust: {:?}\nC:    {:?}",
-                rust_name, rust_layout, &c_layout
-            );
+            eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC:    {c_layout:?}",);
             continue;
         }
 
@@ -194,7 +190,7 @@ fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {
     let mut abi_cmd = Command::new(exe);
     let output = abi_cmd.output()?;
     if !output.status.success() {
-        return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into());
+        return Err(format!("command {abi_cmd:?} failed, {output:?}").into());
     }
 
     Ok(String::from_utf8(output.stdout)?)
diff --git a/gdk4-win32/sys/versions.txt b/gdk4-win32/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gdk4-x11/src/auto/versions.txt b/gdk4-x11/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gdk4-x11/sys/tests/abi.rs b/gdk4-x11/sys/tests/abi.rs
@@ -40,7 +40,7 @@ impl Compiler {
         cmd.arg(out);
         let status = cmd.spawn()?.wait()?;
         if !status.success() {
-            return Err(format!("compilation command {:?} failed, {}", &cmd, status).into());
+            return Err(format!("compilation command {cmd:?} failed, {status}").into());
         }
         Ok(())
     }
@@ -56,7 +56,7 @@ fn get_var(name: &str, default: &str) -> Result<Vec<String>, Box<dyn Error>> {
     match env::var(name) {
         Ok(value) => Ok(shell_words::split(&value)?),
         Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?),
-        Err(err) => Err(format!("{} {}", name, err).into()),
+        Err(err) => Err(format!("{name} {err}").into()),
     }
 }
 
@@ -70,7 +70,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     cmd.args(packages);
     let out = cmd.output()?;
     if !out.status.success() {
-        return Err(format!("command {:?} returned {}", &cmd, out.status).into());
+        return Err(format!("command {cmd:?} returned {}", out.status).into());
     }
     let stdout = str::from_utf8(&out.stdout)?;
     Ok(shell_words::split(stdout.trim())?)
@@ -126,15 +126,14 @@ fn cross_validate_constants_with_c() {
     {
         if rust_name != c_name {
             results.record_failed();
-            eprintln!("Name mismatch:\nRust: {:?}\nC:    {:?}", rust_name, c_name,);
+            eprintln!("Name mismatch:\nRust: {rust_name:?}\nC:    {c_name:?}");
             continue;
         }
 
         if rust_value != c_value {
             results.record_failed();
             eprintln!(
-                "Constant value mismatch for {}\nRust: {:?}\nC:    {:?}",
-                rust_name, rust_value, &c_value
+                "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC:    {c_value:?}",
             );
             continue;
         }
@@ -164,16 +163,13 @@ fn cross_validate_layout_with_c() {
     {
         if rust_name != c_name {
             results.record_failed();
-            eprintln!("Name mismatch:\nRust: {:?}\nC:    {:?}", rust_name, c_name,);
+            eprintln!("Name mismatch:\nRust: {rust_name:?}\nC:    {c_name:?}");
             continue;
         }
 
         if rust_layout != c_layout {
             results.record_failed();
-            eprintln!(
-                "Layout mismatch for {}\nRust: {:?}\nC:    {:?}",
-                rust_name, rust_layout, &c_layout
-            );
+            eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC:    {c_layout:?}",);
             continue;
         }
 
@@ -194,7 +190,7 @@ fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {
     let mut abi_cmd = Command::new(exe);
     let output = abi_cmd.output()?;
     if !output.status.success() {
-        return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into());
+        return Err(format!("command {abi_cmd:?} failed, {output:?}").into());
     }
 
     Ok(String::from_utf8(output.stdout)?)
diff --git a/gdk4-x11/sys/versions.txt b/gdk4-x11/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gdk4/src/auto/versions.txt b/gdk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gdk4/sys/tests/abi.rs b/gdk4/sys/tests/abi.rs
@@ -40,7 +40,7 @@ impl Compiler {
         cmd.arg(out);
         let status = cmd.spawn()?.wait()?;
         if !status.success() {
-            return Err(format!("compilation command {:?} failed, {}", &cmd, status).into());
+            return Err(format!("compilation command {cmd:?} failed, {status}").into());
         }
         Ok(())
     }
@@ -56,7 +56,7 @@ fn get_var(name: &str, default: &str) -> Result<Vec<String>, Box<dyn Error>> {
     match env::var(name) {
         Ok(value) => Ok(shell_words::split(&value)?),
         Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?),
-        Err(err) => Err(format!("{} {}", name, err).into()),
+        Err(err) => Err(format!("{name} {err}").into()),
     }
 }
 
@@ -70,7 +70,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     cmd.args(packages);
     let out = cmd.output()?;
     if !out.status.success() {
-        return Err(format!("command {:?} returned {}", &cmd, out.status).into());
+        return Err(format!("command {cmd:?} returned {}", out.status).into());
     }
     let stdout = str::from_utf8(&out.stdout)?;
     Ok(shell_words::split(stdout.trim())?)
@@ -126,15 +126,14 @@ fn cross_validate_constants_with_c() {
     {
         if rust_name != c_name {
             results.record_failed();
-            eprintln!("Name mismatch:\nRust: {:?}\nC:    {:?}", rust_name, c_name,);
+            eprintln!("Name mismatch:\nRust: {rust_name:?}\nC:    {c_name:?}");
             continue;
         }
 
         if rust_value != c_value {
             results.record_failed();
             eprintln!(
-                "Constant value mismatch for {}\nRust: {:?}\nC:    {:?}",
-                rust_name, rust_value, &c_value
+                "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC:    {c_value:?}",
             );
             continue;
         }
@@ -164,16 +163,13 @@ fn cross_validate_layout_with_c() {
     {
         if rust_name != c_name {
             results.record_failed();
-            eprintln!("Name mismatch:\nRust: {:?}\nC:    {:?}", rust_name, c_name,);
+            eprintln!("Name mismatch:\nRust: {rust_name:?}\nC:    {c_name:?}");
             continue;
         }
 
         if rust_layout != c_layout {
             results.record_failed();
-            eprintln!(
-                "Layout mismatch for {}\nRust: {:?}\nC:    {:?}",
-                rust_name, rust_layout, &c_layout
-            );
+            eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC:    {c_layout:?}",);
             continue;
         }
 
@@ -194,7 +190,7 @@ fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {
     let mut abi_cmd = Command::new(exe);
     let output = abi_cmd.output()?;
     if !output.status.success() {
-        return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into());
+        return Err(format!("command {abi_cmd:?} failed, {output:?}").into());
     }
 
     Ok(String::from_utf8(output.stdout)?)
diff --git a/gdk4/sys/versions.txt b/gdk4/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gsk4/src/auto/versions.txt b/gsk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gsk4/sys/tests/abi.rs b/gsk4/sys/tests/abi.rs
@@ -40,7 +40,7 @@ impl Compiler {
         cmd.arg(out);
         let status = cmd.spawn()?.wait()?;
         if !status.success() {
-            return Err(format!("compilation command {:?} failed, {}", &cmd, status).into());
+            return Err(format!("compilation command {cmd:?} failed, {status}").into());
         }
         Ok(())
     }
@@ -56,7 +56,7 @@ fn get_var(name: &str, default: &str) -> Result<Vec<String>, Box<dyn Error>> {
     match env::var(name) {
         Ok(value) => Ok(shell_words::split(&value)?),
         Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?),
-        Err(err) => Err(format!("{} {}", name, err).into()),
+        Err(err) => Err(format!("{name} {err}").into()),
     }
 }
 
@@ -70,7 +70,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
     cmd.args(packages);
     let out = cmd.output()?;
     if !out.status.success() {
-        return Err(format!("command {:?} returned {}", &cmd, out.status).into());
+        return Err(format!("command {cmd:?} returned {}", out.status).into());
     }
     let stdout = str::from_utf8(&out.stdout)?;
     Ok(shell_words::split(stdout.trim())?)
@@ -126,15 +126,14 @@ fn cross_validate_constants_with_c() {
     {
         if rust_name != c_name {
             results.record_failed();
-            eprintln!("Name mismatch:\nRust: {:?}\nC:    {:?}", rust_name, c_name,);
+            eprintln!("Name mismatch:\nRust: {rust_name:?}\nC:    {c_name:?}");
             continue;
         }
 
         if rust_value != c_value {
             results.record_failed();
             eprintln!(
-                "Constant value mismatch for {}\nRust: {:?}\nC:    {:?}",
-                rust_name, rust_value, &c_value
+                "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC:    {c_value:?}",
             );
             continue;
         }
@@ -164,16 +163,13 @@ fn cross_validate_layout_with_c() {
     {
         if rust_name != c_name {
             results.record_failed();
-            eprintln!("Name mismatch:\nRust: {:?}\nC:    {:?}", rust_name, c_name,);
+            eprintln!("Name mismatch:\nRust: {rust_name:?}\nC:    {c_name:?}");
             continue;
         }
 
         if rust_layout != c_layout {
             results.record_failed();
-            eprintln!(
-                "Layout mismatch for {}\nRust: {:?}\nC:    {:?}",
-                rust_name, rust_layout, &c_layout
-            );
+            eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC:    {c_layout:?}",);
             continue;
         }
 
@@ -194,7 +190,7 @@ fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {
     let mut abi_cmd = Command::new(exe);
     let output = abi_cmd.output()?;
     if !output.status.success() {
-        return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into());
+        return Err(format!("command {abi_cmd:?} failed, {output:?}").into());
     }
 
     Ok(String::from_utf8(output.stdout)?)
diff --git a/gsk4/sys/versions.txt b/gsk4/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gtk4/src/auto/versions.txt b/gtk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)
+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
 from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
diff --git a/gtk4/sys/tests/abi.rs b/gtk4/sys/tests/abi.rs
diff --git a/gtk4/sys/versions.txt b/gtk4/sys/versions.txt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Generated by gir (https://github.com/gtk-rs/gir @ 818f714dc796)`
	`1`	`+Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)`
`2`	`2`	`from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ impl Compiler {`
`40`	`40`	`cmd.arg(out);`
`41`	`41`	`let status = cmd.spawn()?.wait()?;`
`42`	`42`	`if !status.success() {`
`43`		`- return Err(format!("compilation command {:?} failed, {}", &cmd, status).into());`
	`43`	`+ return Err(format!("compilation command {cmd:?} failed, {status}").into());`
`44`	`44`	`}`
`45`	`45`	`Ok(())`
`46`	`46`	`}`
`@@ -56,7 +56,7 @@ fn get_var(name: &str, default: &str) -> Result<Vec<String>, Box<dyn Error>> {`
`56`	`56`	`match env::var(name) {`
`57`	`57`	`Ok(value) => Ok(shell_words::split(&value)?),`
`58`	`58`	`Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?),`
`59`		`- Err(err) => Err(format!("{} {}", name, err).into()),`
	`59`	`+ Err(err) => Err(format!("{name} {err}").into()),`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`@@ -70,7 +70,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {`
`70`	`70`	`cmd.args(packages);`
`71`	`71`	`let out = cmd.output()?;`
`72`	`72`	`if !out.status.success() {`
`73`		`- return Err(format!("command {:?} returned {}", &cmd, out.status).into());`
	`73`	`+ return Err(format!("command {cmd:?} returned {}", out.status).into());`
`74`	`74`	`}`
`75`	`75`	`let stdout = str::from_utf8(&out.stdout)?;`
`76`	`76`	`Ok(shell_words::split(stdout.trim())?)`
`@@ -126,15 +126,14 @@ fn cross_validate_constants_with_c() {`
`126`	`126`	`{`
`127`	`127`	`if rust_name != c_name {`
`128`	`128`	`results.record_failed();`
`129`		`- eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,);`
	`129`	`+ eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}");`
`130`	`130`	`continue;`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`if rust_value != c_value {`
`134`	`134`	`results.record_failed();`
`135`	`135`	`eprintln!(`
`136`		`- "Constant value mismatch for {}\nRust: {:?}\nC: {:?}",`
`137`		`- rust_name, rust_value, &c_value`
	`136`	`+ "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}",`
`138`	`137`	`);`
`139`	`138`	`continue;`
`140`	`139`	`}`
`@@ -164,16 +163,13 @@ fn cross_validate_layout_with_c() {`
`164`	`163`	`{`
`165`	`164`	`if rust_name != c_name {`
`166`	`165`	`results.record_failed();`
`167`		`- eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,);`
	`166`	`+ eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}");`
`168`	`167`	`continue;`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`if rust_layout != c_layout {`
`172`	`171`	`results.record_failed();`
`173`		`- eprintln!(`
`174`		`- "Layout mismatch for {}\nRust: {:?}\nC: {:?}",`
`175`		`- rust_name, rust_layout, &c_layout`
`176`		`- );`
	`172`	`+ eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",);`
`177`	`173`	`continue;`
`178`	`174`	`}`
`179`	`175`
`@@ -194,7 +190,7 @@ fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {`
`194`	`190`	`let mut abi_cmd = Command::new(exe);`
`195`	`191`	`let output = abi_cmd.output()?;`
`196`	`192`	`if !output.status.success() {`
`197`		`- return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into());`
	`193`	`+ return Err(format!("command {abi_cmd:?} failed, {output:?}").into());`
`198`	`194`	`}`
`199`	`195`
`200`	`196`	`Ok(String::from_utf8(output.stdout)?)`