From f1e0e38c341997f95c8c45a7811fe89ac4dcfc0e Mon Sep 17 00:00:00 2001 From: Maxwell Muoto <41130755+max-muoto@users.noreply.github.com> Date: Thu, 30 May 2024 09:17:23 -0700 Subject: [PATCH 1/5] feat: Improve empty collection handling with `next` --- stdlib/builtins.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/builtins.pyi b/stdlib/builtins.pyi index 53e00ec6a5a9..7df41f231d63 100644 --- a/stdlib/builtins.pyi +++ b/stdlib/builtins.pyi @@ -1519,7 +1519,7 @@ def min(iterable: Iterable[_T1], /, *, key: Callable[[_T1], SupportsRichComparis @overload def next(i: SupportsNext[_T], /) -> _T: ... @overload -def next(i: SupportsNext[_T], default: _VT, /) -> _T | _VT: ... +def next(i: SupportsNext[_T], default: _VT | _T, /) -> _T | _VT: ... def oct(number: int | SupportsIndex, /) -> str: ... _Opener: TypeAlias = Callable[[str, int], int] From 495948efb9b4c0251feb1ec3d7b7c92d903d81ad Mon Sep 17 00:00:00 2001 From: Maxwell Muoto <41130755+max-muoto@users.noreply.github.com> Date: Thu, 30 May 2024 09:24:27 -0700 Subject: [PATCH 2/5] Re-trigger builds From b4983185688883669016801affe5ea16989244af Mon Sep 17 00:00:00 2001 From: Maxwell Muoto <41130755+max-muoto@users.noreply.github.com> Date: Thu, 30 May 2024 09:32:38 -0700 Subject: [PATCH 3/5] Third overload --- stdlib/builtins.pyi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stdlib/builtins.pyi b/stdlib/builtins.pyi index 7df41f231d63..5774e7773dff 100644 --- a/stdlib/builtins.pyi +++ b/stdlib/builtins.pyi @@ -1519,7 +1519,9 @@ def min(iterable: Iterable[_T1], /, *, key: Callable[[_T1], SupportsRichComparis @overload def next(i: SupportsNext[_T], /) -> _T: ... @overload -def next(i: SupportsNext[_T], default: _VT | _T, /) -> _T | _VT: ... +def next(i: SupportsNext[_T], default: _VT, /) -> _T | _VT: ... +@overload +def next(i: SupportsNext[_T], default: _T, /) -> _T: ... def oct(number: int | SupportsIndex, /) -> str: ... _Opener: TypeAlias = Callable[[str, int], int] From bd41e5d5e1be9ca68524f747379d9669f276f7d3 Mon Sep 17 00:00:00 2001 From: Maxwell Muoto <41130755+max-muoto@users.noreply.github.com> Date: Thu, 30 May 2024 09:33:55 -0700 Subject: [PATCH 4/5] Tweak --- stdlib/builtins.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/builtins.pyi b/stdlib/builtins.pyi index 5774e7773dff..3589b56f4dc5 100644 --- a/stdlib/builtins.pyi +++ b/stdlib/builtins.pyi @@ -1519,9 +1519,9 @@ def min(iterable: Iterable[_T1], /, *, key: Callable[[_T1], SupportsRichComparis @overload def next(i: SupportsNext[_T], /) -> _T: ... @overload -def next(i: SupportsNext[_T], default: _VT, /) -> _T | _VT: ... +def next(i: SupportsNext[_T], default: _T, /) -> _T: ... @overload -def next(i: SupportsNext[_T], default: _T, /) -> _T: ... +def next(i: SupportsNext[_T], default: _VT, /) -> _T | _VT: ... def oct(number: int | SupportsIndex, /) -> str: ... _Opener: TypeAlias = Callable[[str, int], int] From d40de3a464e6baaf47a8b7993e5e45279f2c1fd6 Mon Sep 17 00:00:00 2001 From: Maxwell Muoto <41130755+max-muoto@users.noreply.github.com> Date: Thu, 30 May 2024 09:36:59 -0700 Subject: [PATCH 5/5] Tweak --- stdlib/builtins.pyi | 2 -- 1 file changed, 2 deletions(-) diff --git a/stdlib/builtins.pyi b/stdlib/builtins.pyi index 3589b56f4dc5..046c97d9a0ce 100644 --- a/stdlib/builtins.pyi +++ b/stdlib/builtins.pyi @@ -1520,8 +1520,6 @@ def min(iterable: Iterable[_T1], /, *, key: Callable[[_T1], SupportsRichComparis def next(i: SupportsNext[_T], /) -> _T: ... @overload def next(i: SupportsNext[_T], default: _T, /) -> _T: ... -@overload -def next(i: SupportsNext[_T], default: _VT, /) -> _T | _VT: ... def oct(number: int | SupportsIndex, /) -> str: ... _Opener: TypeAlias = Callable[[str, int], int]