Skip to content

Commit 756d43a

Browse files
authored
Merge branch 'RustPython:main' into main
2 parents 031d03a + 3f718f9 commit 756d43a

18 files changed

Lines changed: 192 additions & 123 deletions

File tree

Cargo.lock

Lines changed: 43 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ getrandom = { version = "0.3", features = ["std"] }
186186
glob = "0.3"
187187
hex = "0.4.3"
188188
indexmap = { version = "2.14.0", features = ["std"] }
189-
insta = "1.46"
189+
insta = "1.47"
190190
itertools = "0.14.0"
191191
is-macro = "0.3.7"
192192
junction = "1.4.2"
@@ -197,6 +197,7 @@ nix = { version = "0.30", features = ["fs", "user", "process", "term", "time", "
197197
malachite-bigint = "0.9.1"
198198
malachite-q = "0.9.1"
199199
malachite-base = "0.9.1"
200+
maplit = "1.0.2"
200201
memchr = "2.8.0"
201202
num-complex = "0.4.6"
202203
num-integer = "0.1.46"
@@ -221,6 +222,8 @@ static_assertions = "1.1"
221222
strum = "0.28"
222223
strum_macros = "0.28"
223224
syn = "2"
225+
syn-ext = "0.5.0"
226+
textwrap = { version = "0.16.2", default-features = false }
224227
thiserror = "2.0"
225228
icu_properties = "2"
226229
icu_normalizer = "2"

Lib/test/test_collections.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2028,7 +2028,6 @@ def insert(self, index, value):
20282028
self.assertEqual(len(mss), len(mss2))
20292029
self.assertEqual(list(mss), list(mss2))
20302030

2031-
@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: TypeError not raised
20322031
def test_illegal_patma_flags(self):
20332032
with self.assertRaises(TypeError):
20342033
class Both(Collection):

0 commit comments

Comments
 (0)