Skip to content

Rollup of 16 pull requests #57568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 41 commits into from
Jan 13, 2019
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
c0f0f45
Don't actually create a full MIR stack frame when not needed
oli-obk Jan 5, 2019
ddff2ed
Remove unnecessary adapter
sinkuu Jan 6, 2019
f671242
Derive Clone for ArgumentV1
sinkuu Jan 6, 2019
6e742db
Optimise floating point `is_finite` (2x) and `is_infinite` (1.6x).
huonw Jan 5, 2019
6a790d3
Improve the wording
JohnTitor Jan 7, 2019
eed163e
save-analysis: use a fallback when access levels couldn't be computed
Xanewok Jan 7, 2019
14e662d
Manually push a stack frame where no valid frame is needed
oli-obk Jan 8, 2019
cea282b
Make `mk_eval_cx` private to const eval
oli-obk Jan 8, 2019
d9ddc39
lldb_batchmode.py: try `import _thread` for Python 3
cuviper Jan 8, 2019
12ae365
Misc cleanups
sinkuu Jan 6, 2019
46fa818
Change `String` to `&'static str` in `ParseResult::Failure`.
nnethercote Jan 9, 2019
f174b73
Document the `mk_*_eval_cx` functions
oli-obk Jan 9, 2019
cd5a9e0
Explain the arguments of the `mk_*_eval_cx` functions
oli-obk Jan 9, 2019
dec79e4
Not seeing the forest because there are too many trees in the way
oli-obk Jan 9, 2019
c47ed14
save-analysis: Get path def from parent in case there's no def for th…
emilio Jan 9, 2019
bbb5448
std: Render large exit codes as hex on Windows
alexcrichton Jan 9, 2019
07600c9
Drop "solved" constraints during region expansion
dotdash Jan 9, 2019
5f402b8
Add a fast path for identical regions in lub_concrete_regions
dotdash Jan 10, 2019
3f03297
inline pub extern crate statements
DebugSteven Jan 11, 2019
ca47808
add test for pub extern crate
DebugSteven Jan 11, 2019
186d5d7
re-do docs for core::cmp
steveklabnik Jan 10, 2019
7948b18
Use `ptr::eq` where applicable
Xanewok Jan 12, 2019
6aa7856
resolve: Mark extern crate items as used in more cases
petrochenkov Jan 12, 2019
805099c
hygiene: Do not treat `Self` ctor as a local variable
petrochenkov Jan 12, 2019
1e4a8a0
Update the const fn tracking issue to the new metabug
varkor Jan 13, 2019
035eff1
Rollup merge of #57351 - oli-obk:cheap_const_ops, r=RalfJung
Centril Jan 13, 2019
5560d4d
Rollup merge of #57353 - huonw:faster-finiteness-checks, r=KodrAus
Centril Jan 13, 2019
d3cb51c
Rollup merge of #57412 - JohnTitor:improve-the-wording-1, r=varkor
Centril Jan 13, 2019
8e3980b
Rollup merge of #57436 - Xanewok:save-analysis-access-ice-fix, r=niko…
Centril Jan 13, 2019
36c7cde
Rollup merge of #57453 - cuviper:python3-thread, r=nikomatsakis
Centril Jan 13, 2019
b7093e5
Rollup merge of #57454 - sinkuu:fmt_cleanup, r=joshtriplett
Centril Jan 13, 2019
0c53b45
Rollup merge of #57461 - nnethercote:ParseResult-Failure-static-str, …
Centril Jan 13, 2019
b3290fd
Rollup merge of #57473 - alexcrichton:hex-display-on-windows, r=Kimundi
Centril Jan 13, 2019
edec838
Rollup merge of #57474 - emilio:save-analysis-path, r=nrc
Centril Jan 13, 2019
4d6fd9c
Rollup merge of #57494 - dotdash:expand, r=nikomatsakis
Centril Jan 13, 2019
ce448f3
Rollup merge of #57496 - steveklabnik:gh32934, r=Centril
Centril Jan 13, 2019
8f11da4
Rollup merge of #57508 - DebugSteven:inline-extern, r=GuillaumeGomez
Centril Jan 13, 2019
8c1813d
Rollup merge of #57547 - Xanewok:ptr-eq, r=petrochenkov
Centril Jan 13, 2019
c04d6fa
Rollup merge of #57557 - petrochenkov:ecused, r=varkor
Centril Jan 13, 2019
33c5874
Rollup merge of #57560 - petrochenkov:selfinmac, r=alexreg
Centril Jan 13, 2019
3e2dcf9
Rollup merge of #57564 - varkor:update-const_fn-tracking-issue, r=Cen…
Centril Jan 13, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lldb_batchmode.py: try import _thread for Python 3
  • Loading branch information
cuviper committed Jan 8, 2019
commit d9ddc39052c91568936427e3dee087b608140cf4
7 changes: 6 additions & 1 deletion src/etc/lldb_batchmode.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@
import os
import sys
import threading
import thread
import re
import time

try:
import thread
except ModuleNotFoundError:
# The `thread` module was renamed to `_thread` in Python 3.
import _thread as thread

# Set this to True for additional output
DEBUG_OUTPUT = False

Expand Down