Skip to content

Declare nullable argument defaults directly #9560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 4 commits into from
Nov 3, 2026
Merged

Declare nullable argument defaults directly #9560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77ffbb6
Replace concrete omission wrappers with typed defaults
youknowdot Nov 3, 2026
175b406
Preserve native omitted argument fast paths
youknowdot Nov 3, 2026
1fddea5
Infer epoll exit argument names from fields
youknowdot Nov 3, 2026
9b00ab3
Remove unused regex OptionalArg import
youknowdot Nov 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions crates/stdlib/src/select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,13 +485,14 @@ mod decl {
}

#[derive(FromArgs)]
#[allow(dead_code)]
struct EpollExitArgs {
#[pyarg(positional, optional, name = "exc_type", py_default = "None")]
_exc_type: OptionalArg,
#[pyarg(positional, optional, name = "exc_value", py_default = "None")]
_exc_value: OptionalArg,
#[pyarg(positional, optional, name = "exc_tb", py_default = "None")]
_exc_tb: OptionalArg,
#[pyarg(positional, default = None)]
exc_type: Option<PyObjectRef>,
#[pyarg(positional, default = None)]
exc_value: Option<PyObjectRef>,
#[pyarg(positional, default = None)]
exc_tb: Option<PyObjectRef>,
}

#[pyclass(with(Constructor))]
Expand Down
11 changes: 3 additions & 8 deletions crates/vm/src/stdlib/_signal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,18 +406,15 @@ pub(crate) mod _signal {
Ok(old_fd as i64)
}

#[cfg(any(target_os = "android", target_os = "linux"))]
use crate::function::OptionalArg;

#[cfg(any(target_os = "android", target_os = "linux"))]
#[derive(FromArgs)]
struct PidfdSendSignalArgs {
#[pyarg(positional)]
pidfd: i32,
#[pyarg(positional, name = "signalnum")]
sig: core::ffi::c_int,
#[pyarg(positional, optional, py_default = "None")]
siginfo: OptionalArg<PyObjectRef>,
#[pyarg(positional, default = None)]
siginfo: Option<PyObjectRef>,
#[pyarg(positional, default)]
flags: core::ffi::c_int,
}
Expand All @@ -433,9 +430,7 @@ pub(crate) mod _signal {
}: PidfdSendSignalArgs,
vm: &VirtualMachine,
) -> PyResult<()> {
if let OptionalArg::Present(obj) = siginfo
&& !vm.is_none(&obj)
{
if siginfo.is_some() {
return Err(vm.new_type_error("siginfo must be None"));
}

Expand Down
8 changes: 4 additions & 4 deletions crates/vm/src/stdlib/_sre.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mod _sre {
common::wtf8::{Wtf8, Wtf8Buf, wtf8_concat},
common::{ascii, hash::PyHash},
convert::ToPyObject,
function::{ArgCallable, DefaultRepr, OptionalArg, PosArgs, PyComparisonValue},
function::{ArgCallable, DefaultRepr, PosArgs, PyComparisonValue},
protocol::{BufferFlags, PyBuffer, PyCallable, PyMappingMethods},
stdlib::sys,
types::{AsMapping, Comparable, Hashable, Representable},
Expand Down Expand Up @@ -338,8 +338,8 @@ mod _sre {
#[derive(FromArgs)]
struct DefaultArg {
// Missing default is None.
#[pyarg(any, optional, py_default = "None")]
default: OptionalArg<PyObjectRef>,
#[pyarg(any, default = None)]
default: Option<PyObjectRef>,
}

/// A position in the searched string, taken as a Py_ssize_t; a negative
Expand Down Expand Up @@ -648,7 +648,7 @@ mod _sre {
} else {
m.groups(
DefaultArg {
default: OptionalArg::Present(empty.clone()),
default: Some(empty.clone()),
},
vm,
)?
Expand Down
8 changes: 4 additions & 4 deletions crates/vm/src/stdlib/posix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,8 +1103,8 @@ pub mod module {
path: MkfifoPath,
#[pyarg(any, default = MkfifoMode(0o666), py_default = "438")]
mode: MkfifoMode,
#[pyarg(named, optional, py_default = "None")]
dir_fd: OptionalArg<PyObjectRef>,
#[pyarg(named, default = None)]
dir_fd: Option<PyObjectRef>,
}

#[cfg(not(any(target_os = "redox", target_os = "wasi")))]
Expand All @@ -1115,7 +1115,7 @@ pub mod module {
// Keep a raw C int: even -1 is valid with an absolute path, for which
// mkfifoat ignores dir_fd. BorrowedFd cannot represent that value.
let dir_fd = match args.dir_fd {
OptionalArg::Present(fd) if !vm.is_none(&fd) => {
Some(fd) => {
warn_if_bool_fd(&fd, vm)?;
let fd = fd.try_index_opt(vm).unwrap_or_else(|| {
Err(vm.new_type_error(format!(
Expand All @@ -1133,7 +1133,7 @@ pub mod module {
})?;
(fd != rustpython_host_env::os::AT_FDCWD).then_some(fd)
}
_ => None,
None => None,
};
if dir_fd.is_some() && !host_posix::has_mkfifoat() {
return Err(vm.new_not_implemented_error("dir_fd unavailable on this platform"));
Expand Down
Loading