Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-14 18:05:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

build(deps): bump nix from 0.29.0 to 0.30.1 (#38650)

Browse source 
Bumps [nix](https://github.com/nix-rust/nix) from 0.29.0 to 0.30.1.
- [Changelog](https://github.com/nix-rust/nix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nix-rust/nix/compare/v0.29.0...v0.30.1)

Closes: #38145
Testing: Covered by existing tests

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender 2025-08-13 11:51:40 +02:00 • committed by GitHub
parent 069ad40872
commit d0d952d1fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -687,7 +687,7 @@ dependencies = [
"libc",
"log",
"mach2",
"nix 0.29.0",
"nix 0.30.1",
"rustc-demangle",
"serde_json",
]
@ -7773,7 +7773,7 @@ dependencies = [
"napi-ohos",
"net",
"net_traits",
"nix 0.29.0",
"nix 0.30.1",
"objc2-app-kit 0.3.1",
"objc2-foundation 0.3.1",
"ohos-abilitykit-sys",

2
Cargo.toml
View file

@ -106,7 +106,7 @@ mime = "0.3.13"
mime_guess = "2.0.5"
mozangle = "0.5.3"
net_traits = { path = "components/shared/net" }
nix = "0.29"
nix = "0.30"
nom = "8.0.0"
num-traits = "0.2"
num_cpus = "1.17.0"

23
ports/servoshell/egl/log.rs
View file

@ -4,7 +4,7 @@
//! Helper Module to redirect stdout/stderr to the logging sink
use std::os::fd::{AsRawFd, IntoRawFd, RawFd};
use std::os::fd::{IntoRawFd, RawFd};
use std::thread;
use log::{debug, error, info, warn};
@ -34,12 +34,19 @@ pub(crate) fn redirect_stdout_and_stderr() -> Result<(), LogRedirectError> {
// The first step is to redirect stdout and stderr to the logs.
// We redirect stdout and stderr to a custom descriptor.
let (readerfd, writerfd) = nix::unistd::pipe().map_err(LogRedirectError::CreatePipeFailed)?;
// Leaks the writer fd. We want to log for the whole program lifetime.
let raw_writerfd = writerfd.into_raw_fd();
let _fd = nix::unistd::dup2(raw_writerfd, RawFd::from(1))
.map_err(LogRedirectError::RedirectToPipeFailed)?;
let _fd = nix::unistd::dup2(raw_writerfd, RawFd::from(2))
.map_err(LogRedirectError::RedirectToPipeFailed)?;
// SAFETY: `writerfd`, `fd1` and `fd2` are all `OwnedFd`s for the same file.
// We take care to leak all 3 of them to ensure the writerfd is not closed, and thus
// naturally also prevent double closes.
unsafe {
let fd1 = nix::unistd::dup2_raw(&writerfd, RawFd::from(1))
.map_err(LogRedirectError::RedirectToPipeFailed)?;
let fd2 = nix::unistd::dup2_raw(&writerfd, RawFd::from(2))
.map_err(LogRedirectError::RedirectToPipeFailed)?;
// Leaks the writer fds. We want to log for the whole program lifetime.
let _ = writerfd.into_raw_fd();
let _ = fd1.into_raw_fd();
let _ = fd2.into_raw_fd();
}
// Then we spawn a thread whose only job is to read from the other side of the
// pipe and redirect to the logs.
@ -52,7 +59,7 @@ pub(crate) fn redirect_stdout_and_stderr() -> Result<(), LogRedirectError> {
loop {
let result = {
let read_into = &mut buf[cursor..];
nix::unistd::read(readerfd.as_raw_fd(), read_into)
nix::unistd::read(&readerfd, read_into)
};
let end = match result {