Merge branch 'master' into TheAnyKey/p38_named_expression_completion_step2

Author: TheAnyKey

.github/workflows/cron-ci.yaml

@@ -30,7 +30,7 @@ jobs:
           args: --verbose
         env:
           CARGO_INCREMENTAL: '0'
-          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zno-landing-pads'
+          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests' # -Cpanic=abort
       - uses: actions/setup-python@v1
         with:
           python-version: 3.8

Cargo.lock

@@ -27,7 +27,7 @@ clap = "2.33"
 rustpython-compiler = {path = "compiler", version = "0.1.1"}
 rustpython-parser = {path = "parser", version = "0.1.1"}
 rustpython-vm = {path = "vm", version = "0.1.1"}
-dirs = "=2.0.1"
+dirs = { package = "dirs-next", version = "1.0" }
 num-traits = "0.2.8"
 cfg-if = "0.1"
 
@@ -47,10 +47,8 @@ path = "src/main.rs"
 
 [patch.crates-io]
 # REDOX START, Uncommment when you want to compile/check with redoxer
-# time = { git = "https://gitlab.redox-os.org/redox-os/time.git", branch = "redox-unix" }
-# nix = { git = "https://github.com/coolreader18/nix", branch = "add-redox-support" }
 # # following patches are just waiting on a new version to be released to crates.io
-# socket2 = { git = "https://github.com/alexcrichton/socket2-rs", rev = "75fe3f2fe0e3079ad9d4dfb3a19e60bea3f2f055" }
-# rustyline = { git = "https://github.com/kkawakam/rustyline" }
-# libc = { git = "https://github.com/rust-lang/libc" }
+# nix = { git = "https://github.com/nix-rust/nix" }
+# crossbeam-utils = { git = "https://github.com/crossbeam-rs/crossbeam" }
+# socket2 = { git = "https://github.com/alexcrichton/socket2-rs" }
 # REDOX END

Cargo.toml

@@ -126,7 +126,8 @@
 
 affects what we see:
 
-  >>> mydata.number
+  >>> # TODO: RUSTPYTHON, __slots__
+  >>> mydata.number #doctest: +SKIP
   11
 
 >>> del mydata

Lib/_threading_local.py

@@ -158,7 +158,7 @@ class RegexFlag(enum.IntFlag):
     TEMPLATE = sre_compile.SRE_FLAG_TEMPLATE # disable backtracking
     T = TEMPLATE
     DEBUG = sre_compile.SRE_FLAG_DEBUG # dump pattern after compilation
-#TODO: globals().update(RegexFlag.__members__) once mappingproxy has __iter__
+# TODO: globals().update(RegexFlag.__members__) once mappingproxy has __iter__
 for name in ("ASCII","IGNORECASE","LOCALE","UNICODE","MULTILINE","DOTALL",
              "VERBOSE","A","I","L","U","M","S","X","TEMPLATE","T","DEBUG"):
     globals()[name] = getattr(RegexFlag, name)

Lib/re.py

@@ -614,7 +614,7 @@ def _main(self, tests, kwargs):
 
         # If we're on windows and this is the parent runner (not a worker),
         # track the load average.
-        # TODO: RustPython
+        # TODO: RUSTPYTHON
         # if sys.platform == 'win32' and (self.ns.worker_args is None):
         #     from test.libregrtest.win_utils import WindowsLoadTracker
 

Lib/test/libregrtest/main.py

@@ -321,6 +321,7 @@ def test_repeat(self):
             self.assertEqual(self.type2test(s)*(-4), self.type2test([]))
             self.assertEqual(id(s), id(s*1))
 
+    @unittest.skip("TODO: RUSTPYTHON")
     def test_bigrepeat(self):
         if sys.maxsize <= 2147483647:
             x = self.type2test([0])

Lib/test/seq_tests.py

@@ -352,7 +352,8 @@ def test_expandtabs(self):
 
         self.checkraises(TypeError, 'hello', 'expandtabs', 42, 42)
         # This test is only valid when sizeof(int) == sizeof(void*) == 4.
-        if sys.maxsize < (1 << 32) and struct.calcsize('P') == 4:
+        # XXX RUSTPYTHON TODO: expandtabs overflow checks
+        if sys.maxsize < (1 << 32) and struct.calcsize('P') == 4 and False:
             self.checkraises(OverflowError,
                              '\ta\n\tb', 'expandtabs', sys.maxsize)
 
@@ -672,6 +673,7 @@ def test_replace(self):
         self.checkraises(TypeError, 'hello', 'replace', 42, 'h')
         self.checkraises(TypeError, 'hello', 'replace', 'h', 42)
 
+    @unittest.skip("TODO: RUSTPYTHON")
     @unittest.skipIf(sys.maxsize > (1 << 32) or struct.calcsize('P') != 4,
                      'only applies to 32-bit platforms')
     def test_replace_overflow(self):

Lib/test/string_tests.py

@@ -54,8 +54,6 @@ def test_copy(self):
             self.assertEqual(a, b)
             self.assertEqual(type(a), type(b))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_empty_sequence(self):
         b = self.type2test()
         self.assertEqual(len(b), 0)

Lib/test/test_bytes.py

@@ -308,9 +308,9 @@ def outer(cls):
                 return 'eggs'
 
         self.assertEqual(Class.inner(), 'spam')
-        #self.assertEqual(Class.outer(), 'eggs') # TODO RustPython
+        #self.assertEqual(Class.outer(), 'eggs') # TODO: RUSTPYTHON
         self.assertEqual(Class().inner(), 'spam')
-        #self.assertEqual(Class().outer(), 'eggs') # TODO RustPython
+        #self.assertEqual(Class().outer(), 'eggs') # TODO: RUSTPYTHON
 
 
 class TestClassDecorators(unittest.TestCase):