Skip to content

Commit e181798

Browse files
rust-timerrust-timer
authored
Unrolled build for #155685
Rollup merge of #155685 - Walnut356:ret_type, r=jieyouxu Fix `get_child_at_index` return type hints returning `None` is valid when the index is invalid, so the type hints should reflect that
2 parents 9836b06 + c1936ba commit e181798

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

‎src/etc/lldb_providers.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22
import sys
3-
from typing import Generator, List, TYPE_CHECKING
3+
from typing import Generator, List, TYPE_CHECKING, Optional
44

55
from lldb import (
66
SBData,
@@ -112,7 +112,7 @@ def get_child_index(self, name: str) -> int:
112112
return self.valobj.Dereference().GetSyntheticValue()
113113
return self.valobj.GetIndexOfChildWithName(name)
114114

115-
def get_child_at_index(self, index: int) -> SBValue:
115+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
116116
return self.valobj.GetChildAtIndex(index)
117117

118118
def update(self):
@@ -137,7 +137,7 @@ def get_child_index(self, name: str) -> int:
137137
return 0
138138
return -1
139139

140-
def get_child_at_index(self, index: int) -> SBValue:
140+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
141141
if index == 0:
142142
return self.valobj.Dereference().GetSyntheticValue()
143143
return None
@@ -164,7 +164,7 @@ def num_children(self) -> int:
164164
def get_child_index(self, name: str) -> int:
165165
return -1
166166

167-
def get_child_at_index(self, index: int) -> SBValue:
167+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
168168
return None
169169

170170
def update(self):
@@ -425,7 +425,7 @@ def num_children(self) -> int:
425425
def get_child_index(self, name: str) -> int:
426426
return self.fields.get(name, -1)
427427

428-
def get_child_at_index(self, index: int) -> SBValue:
428+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
429429
if self.is_variant:
430430
field = self.type.GetFieldAtIndex(index + 1)
431431
else:
@@ -470,7 +470,7 @@ def get_child_index(self, name: str) -> int:
470470

471471
return -1
472472

473-
def get_child_at_index(self, index: int) -> SBValue:
473+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
474474
if not 0 <= index < self.length:
475475
return None
476476
start = self.data_ptr.GetValueAsUnsigned()
@@ -506,7 +506,7 @@ def get_child_index(self, name: str) -> int:
506506

507507
return -1
508508

509-
def get_child_at_index(self, index: int) -> SBValue:
509+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
510510
if not 0 <= index < self.length:
511511
return None
512512
start = self.data_ptr.GetValueAsUnsigned()
@@ -562,7 +562,7 @@ def num_children(self) -> int:
562562
def get_child_index(self, name: str) -> int:
563563
return self.value.GetIndexOfChildWithName(name)
564564

565-
def get_child_at_index(self, index: int) -> SBValue:
565+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
566566
return self.value.GetChildAtIndex(index)
567567

568568
def update(self):
@@ -768,7 +768,7 @@ def num_children(self) -> int:
768768
def get_child_index(self, name: str) -> int:
769769
return self.value.GetIndexOfChildWithName(name)
770770

771-
def get_child_at_index(self, index: int) -> SBValue:
771+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
772772
return self.value.GetChildAtIndex(index)
773773

774774
def has_children(self) -> bool:
@@ -858,7 +858,7 @@ def get_child_index(self, name: str) -> int:
858858
else:
859859
return -1
860860

861-
def get_child_at_index(self, index: int) -> SBValue:
861+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
862862
if self.is_variant:
863863
field = self.type.GetFieldAtIndex(index + 1)
864864
else:
@@ -887,7 +887,7 @@ def num_children(self) -> int:
887887
def get_child_index(self, name: str) -> int:
888888
return self.valobj.GetIndexOfChildWithName(name)
889889

890-
def get_child_at_index(self, index: int) -> SBValue:
890+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
891891
child: SBValue = self.valobj.GetChildAtIndex(index)
892892
offset = self.valobj.GetType().GetFieldAtIndex(index).byte_offset
893893
return self.valobj.CreateChildAtOffset(str(index), offset, child.GetType())
@@ -935,7 +935,7 @@ def get_child_index(self, name: str) -> int:
935935
else:
936936
return -1
937937

938-
def get_child_at_index(self, index: int) -> SBValue:
938+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
939939
start = self.data_ptr.GetValueAsUnsigned()
940940
address = start + index * self.element_type_size
941941
element = self.data_ptr.CreateValueFromAddress(
@@ -983,7 +983,7 @@ def get_child_index(self, name: str) -> int:
983983
else:
984984
return -1
985985

986-
def get_child_at_index(self, index: int) -> SBValue:
986+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
987987
start = self.data_ptr.GetValueAsUnsigned()
988988
address = start + index * self.element_size
989989
element = self.data_ptr.CreateValueFromAddress(
@@ -1047,7 +1047,7 @@ def get_child_index(self, name: str) -> int:
10471047
else:
10481048
return -1
10491049

1050-
def get_child_at_index(self, index: int) -> SBValue:
1050+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
10511051
start = self.data_ptr.GetValueAsUnsigned()
10521052
address = start + ((index + self.head) % self.cap) * self.element_type_size
10531053
element = self.data_ptr.CreateValueFromAddress(
@@ -1106,7 +1106,7 @@ def get_child_index(self, name: str) -> int:
11061106
else:
11071107
return -1
11081108

1109-
def get_child_at_index(self, index: int) -> SBValue:
1109+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
11101110
# logger = Logger.Logger()
11111111
start = self.data_ptr.GetValueAsUnsigned() & ~1
11121112

@@ -1195,7 +1195,7 @@ def get_child_index(self, name: str) -> int:
11951195
else:
11961196
return -1
11971197

1198-
def get_child_at_index(self, index: int) -> SBValue:
1198+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
11991199
pairs_start = self.data_ptr.GetValueAsUnsigned()
12001200
idx = self.valid_indices[index]
12011201
if self.new_layout:
@@ -1318,7 +1318,7 @@ def get_child_index(self, name: str) -> int:
13181318
return 2
13191319
return -1
13201320

1321-
def get_child_at_index(self, index: int) -> SBValue:
1321+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
13221322
if index == 0:
13231323
return self.value
13241324
if index == 1:
@@ -1351,7 +1351,7 @@ def get_child_index(self, name: str) -> int:
13511351
return 0
13521352
return -1
13531353

1354-
def get_child_at_index(self, index: int) -> SBValue:
1354+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
13551355
if index == 0:
13561356
return self.value
13571357
return None
@@ -1406,7 +1406,7 @@ def get_child_index(self, name: str) -> int:
14061406
return 1
14071407
return -1
14081408

1409-
def get_child_at_index(self, index: int) -> SBValue:
1409+
def get_child_at_index(self, index: int) -> Optional[SBValue]:
14101410
if index == 0:
14111411
return self.value
14121412
if index == 1:

0 commit comments

Comments
 (0)