mirror of
https://github.com/openai/codex.git
synced 2026-11-21 22:50:37 +00:00
## Why `codex-utils-pty` and `codex-windows-sandbox` were the remaining crates in `codex-rs` that still overrode the workspace's Rust 2024 edition. Moving them forward in a separate PR keeps the baseline edition update isolated from the follow-on Bazel clippy workflow in #15955, while making linting and formatting behavior consistent with the rest of the workspace. This PR also needs Cargo and Bazel to agree on the edition for `codex-windows-sandbox`. Without the Bazel-side sync, the experimental Bazel app-server builds fail once they compile `windows-sandbox-rs`. ## What changed - switch `codex-rs/utils/pty` and `codex-rs/windows-sandbox-rs` to `edition = "2024"` - update `codex-utils-pty` callsites and tests to use the collapsed `if let` form that Clippy expects under the new edition - fix the Rust 2024 fallout in `windows-sandbox-rs`, including the reserved `gen` identifier, `unsafe extern` requirements, and new Clippy findings that surfaced under the edition bump - keep the edition bump separate from a larger unsafe cleanup by temporarily allowing `unsafe_op_in_unsafe_fn` in the Windows entrypoint modules that now report it under Rust 2024 - update `codex-rs/windows-sandbox-rs/BUILD.bazel` to `crate_edition = "2024"` so Bazel compiles the crate with the same edition as Cargo --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/openai/codex/pull/15954). * #15976 * #15955 * __->__ #15954
92 lines
3.1 KiB
Rust
92 lines
3.1 KiB
Rust
#![allow(clippy::uninit_vec)]
|
|
|
|
// This file is copied from https://github.com/wezterm/wezterm (MIT license).
|
|
// Copyright (c) 2018-Present Wez Furlong
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
// of this software and associated documentation files (the "Software"), to deal
|
|
// in the Software without restriction, including without limitation the rights
|
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
// copies of the Software, and to permit persons to whom the Software is
|
|
// furnished to do so, subject to the following conditions:
|
|
// The above copyright notice and this permission notice shall be included in
|
|
// all copies or substantial portions of the Software.
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
// SOFTWARE.
|
|
|
|
use super::psuedocon::HPCON;
|
|
use anyhow::Error;
|
|
use anyhow::ensure;
|
|
use std::io::Error as IoError;
|
|
use std::mem;
|
|
use std::ptr;
|
|
use winapi::shared::minwindef::DWORD;
|
|
use winapi::um::processthreadsapi::*;
|
|
|
|
const PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE: usize = 0x00020016;
|
|
|
|
pub struct ProcThreadAttributeList {
|
|
data: Vec<u8>,
|
|
}
|
|
|
|
impl ProcThreadAttributeList {
|
|
pub fn with_capacity(num_attributes: DWORD) -> Result<Self, Error> {
|
|
let mut bytes_required: usize = 0;
|
|
unsafe {
|
|
InitializeProcThreadAttributeList(
|
|
ptr::null_mut(),
|
|
num_attributes,
|
|
0,
|
|
&mut bytes_required,
|
|
)
|
|
};
|
|
let mut data = Vec::with_capacity(bytes_required);
|
|
unsafe { data.set_len(bytes_required) };
|
|
|
|
let attr_ptr = data.as_mut_slice().as_mut_ptr() as *mut _;
|
|
let res = unsafe {
|
|
InitializeProcThreadAttributeList(attr_ptr, num_attributes, 0, &mut bytes_required)
|
|
};
|
|
ensure!(
|
|
res != 0,
|
|
"InitializeProcThreadAttributeList failed: {}",
|
|
IoError::last_os_error()
|
|
);
|
|
Ok(Self { data })
|
|
}
|
|
|
|
pub fn as_mut_ptr(&mut self) -> LPPROC_THREAD_ATTRIBUTE_LIST {
|
|
self.data.as_mut_slice().as_mut_ptr() as *mut _
|
|
}
|
|
|
|
pub fn set_pty(&mut self, con: HPCON) -> Result<(), Error> {
|
|
let res = unsafe {
|
|
UpdateProcThreadAttribute(
|
|
self.as_mut_ptr(),
|
|
0,
|
|
PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE,
|
|
con,
|
|
mem::size_of::<HPCON>(),
|
|
ptr::null_mut(),
|
|
ptr::null_mut(),
|
|
)
|
|
};
|
|
ensure!(
|
|
res != 0,
|
|
"UpdateProcThreadAttribute failed: {}",
|
|
IoError::last_os_error()
|
|
);
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl Drop for ProcThreadAttributeList {
|
|
fn drop(&mut self) {
|
|
unsafe { DeleteProcThreadAttributeList(self.as_mut_ptr()) };
|
|
}
|
|
}
|