Skip to content

Commit d45bef9

Browse files
committedJan 13, 2019
Auto merge of #57568 - Centril:rollup, r=Centril
Rollup of 16 pull requests Successful merges: - #57351 (Don't actually create a full MIR stack frame when not needed) - #57353 (Optimise floating point `is_finite` (2x) and `is_infinite` (1.6x).) - #57412 (Improve the wording) - #57436 (save-analysis: use a fallback when access levels couldn't be computed) - #57453 (lldb_batchmode.py: try `import _thread` for Python 3) - #57454 (Some cleanups for core::fmt) - #57461 (Change `String` to `&'static str` in `ParseResult::Failure`.) - #57473 (std: Render large exit codes as hex on Windows) - #57474 (save-analysis: Get path def from parent in case there's no def for the path itself.) - #57494 (Speed up item_bodies for large match statements involving regions) - #57496 (re-do docs for core::cmp) - #57508 (rustdoc: Allow inlining of reexported crates and crate items) - #57547 (Use `ptr::eq` where applicable) - #57557 (resolve: Mark extern crate items as used in more cases) - #57560 (hygiene: Do not treat `Self` ctor as a local variable) - #57564 (Update the const fn tracking issue to the new metabug) Failed merges: r? @ghost
2 parents 5012d7f + 3e2dcf9 commit d45bef9

File tree

59 files changed

+353
-186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+353
-186
lines changed
 

‎src/doc/unstable-book/src/language-features/const-fn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# `const_fn`
22

3-
The tracking issue for this feature is: [#24111]
3+
The tracking issue for this feature is: [#57563]
44

5-
[#24111]: https://github.com/rust-lang/rust/issues/24111
5+
[#57563]: https://github.com/rust-lang/rust/issues/57563
66

77
------------------------
88

‎src/etc/lldb_batchmode.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,15 @@
1818
import os
1919
import sys
2020
import threading
21-
import thread
2221
import re
2322
import time
2423

24+
try:
25+
import thread
26+
except ModuleNotFoundError:
27+
# The `thread` module was renamed to `_thread` in Python 3.
28+
import _thread as thread
29+
2530
# Set this to True for additional output
2631
DEBUG_OUTPUT = False
2732

0 commit comments

Comments
 (0)
Please sign in to comment.