Skip to content

Commit d8ac485

Browse files
Regenerate with latest gir/gir-files
1 parent ef24cff commit d8ac485

File tree

28 files changed

+371
-126
lines changed

28 files changed

+371
-126
lines changed

gdk4-wayland/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
1+
Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)

gdk4-wayland/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
1+
Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)

gdk4-win32/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
1+
Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)

gdk4-win32/sys/tests/abi.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::error::Error;
1010
use std::ffi::OsString;
1111
use std::mem::{align_of, size_of};
1212
use std::path::Path;
13-
use std::process::Command;
13+
use std::process::{Command, Stdio};
1414
use std::str;
1515
use tempfile::Builder;
1616

@@ -70,9 +70,11 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
7070
let mut cmd = Command::new(pkg_config);
7171
cmd.arg("--cflags");
7272
cmd.args(packages);
73+
cmd.stderr(Stdio::inherit());
7374
let out = cmd.output()?;
7475
if !out.status.success() {
75-
return Err(format!("command {cmd:?} returned {}", out.status).into());
76+
let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout));
77+
return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into());
7678
}
7779
let stdout = str::from_utf8(&out.stdout)?;
7880
Ok(shell_words::split(stdout.trim())?)
@@ -187,13 +189,15 @@ fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {
187189
let cc = Compiler::new().expect("configured compiler");
188190
cc.compile(&c_file, &exe)?;
189191

190-
let mut abi_cmd = Command::new(exe);
191-
let output = abi_cmd.output()?;
192-
if !output.status.success() {
193-
return Err(format!("command {abi_cmd:?} failed, {output:?}").into());
192+
let mut cmd = Command::new(exe);
193+
cmd.stderr(Stdio::inherit());
194+
let out = cmd.output()?;
195+
if !out.status.success() {
196+
let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout));
197+
return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into());
194198
}
195199

196-
Ok(String::from_utf8(output.stdout)?)
200+
Ok(String::from_utf8(out.stdout)?)
197201
}
198202

199203
const RUST_LAYOUTS: &[(&str, Layout)] = &[(

gdk4-win32/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
1+
Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)

gdk4-x11/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
1+
Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)

gdk4-x11/sys/tests/abi.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::error::Error;
1010
use std::ffi::OsString;
1111
use std::mem::{align_of, size_of};
1212
use std::path::Path;
13-
use std::process::Command;
13+
use std::process::{Command, Stdio};
1414
use std::str;
1515
use tempfile::Builder;
1616

@@ -70,9 +70,11 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
7070
let mut cmd = Command::new(pkg_config);
7171
cmd.arg("--cflags");
7272
cmd.args(packages);
73+
cmd.stderr(Stdio::inherit());
7374
let out = cmd.output()?;
7475
if !out.status.success() {
75-
return Err(format!("command {cmd:?} returned {}", out.status).into());
76+
let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout));
77+
return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into());
7678
}
7779
let stdout = str::from_utf8(&out.stdout)?;
7880
Ok(shell_words::split(stdout.trim())?)
@@ -187,13 +189,15 @@ fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {
187189
let cc = Compiler::new().expect("configured compiler");
188190
cc.compile(&c_file, &exe)?;
189191

190-
let mut abi_cmd = Command::new(exe);
191-
let output = abi_cmd.output()?;
192-
if !output.status.success() {
193-
return Err(format!("command {abi_cmd:?} failed, {output:?}").into());
192+
let mut cmd = Command::new(exe);
193+
cmd.stderr(Stdio::inherit());
194+
let out = cmd.output()?;
195+
if !out.status.success() {
196+
let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout));
197+
return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into());
194198
}
195199

196-
Ok(String::from_utf8(output.stdout)?)
200+
Ok(String::from_utf8(out.stdout)?)
197201
}
198202

199203
const RUST_LAYOUTS: &[(&str, Layout)] = &[(

gdk4-x11/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
1+
Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)

gdk4/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58)
1+
Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)

gdk4/sys/tests/abi.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use std::error::Error;
1010
use std::ffi::OsString;
1111
use std::mem::{align_of, size_of};
1212
use std::path::Path;
13-
use std::process::Command;
13+
use std::process::{Command, Stdio};
1414
use std::str;
1515
use tempfile::Builder;
1616

@@ -70,9 +70,11 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
7070
let mut cmd = Command::new(pkg_config);
7171
cmd.arg("--cflags");
7272
cmd.args(packages);
73+
cmd.stderr(Stdio::inherit());
7374
let out = cmd.output()?;
7475
if !out.status.success() {
75-
return Err(format!("command {cmd:?} returned {}", out.status).into());
76+
let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout));
77+
return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into());
7678
}
7779
let stdout = str::from_utf8(&out.stdout)?;
7880
Ok(shell_words::split(stdout.trim())?)
@@ -187,13 +189,15 @@ fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {
187189
let cc = Compiler::new().expect("configured compiler");
188190
cc.compile(&c_file, &exe)?;
189191

190-
let mut abi_cmd = Command::new(exe);
191-
let output = abi_cmd.output()?;
192-
if !output.status.success() {
193-
return Err(format!("command {abi_cmd:?} failed, {output:?}").into());
192+
let mut cmd = Command::new(exe);
193+
cmd.stderr(Stdio::inherit());
194+
let out = cmd.output()?;
195+
if !out.status.success() {
196+
let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout));
197+
return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into());
194198
}
195199

196-
Ok(String::from_utf8(output.stdout)?)
200+
Ok(String::from_utf8(out.stdout)?)
197201
}
198202

199203
const RUST_LAYOUTS: &[(&str, Layout)] = &[

0 commit comments

Comments
 (0)