Skip to content
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

Rollup of 25 pull requests #57063

Merged
merged 61 commits into from
Dec 23, 2018
Merged
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
3e7a4ca
Remove a wrong multiplier on relocation offset computation
oli-obk Dec 17, 2018
e7e17f9
static eval: Do not ICE on layout size overflow
dlrobertson Dec 17, 2018
6130fc8
Add --progress to git submodule commands
Dec 17, 2018
e36b628
rename div_euc -> div_euclid, and mod_euc -> rem_euclid
ubsan Dec 18, 2018
82e55c1
deny intra-doc link resolution failures in libstd
euclio Dec 18, 2018
de39aea
fix tests
ubsan Dec 18, 2018
5056669
Fix rustdoc-js tests
JohnHeitmann Dec 18, 2018
50eb5f6
Explain the math
oli-obk Dec 18, 2018
3d8a066
Replace current crate's searchIndex when regenerating
GuillaumeGomez Dec 18, 2018
00bd306
Extend documentation for mem uninit to discuss partial allocation of …
Firstyear Dec 19, 2018
0829d0c
Updates based on comment
Firstyear Dec 19, 2018
b2d8040
Fix tidy error
Firstyear Dec 19, 2018
202904b
make basic CTFE tracing available on release builds
RalfJung Dec 19, 2018
885cf2a
Adding unwinding support for x86_64_fortanix_unknown_sgx target.
Dec 14, 2018
81a45e2
miri: allocation is infallible
RalfJung Dec 19, 2018
818ed69
dropck: simplify common patterns
ljedrz Dec 19, 2018
ae3f6b0
dropck: remove unnecessary call to cloned()
ljedrz Dec 19, 2018
7eb67c2
test: Ignore ui/target-feature-gate on powerpc and powerpc64(le)
glaubitz Dec 19, 2018
a153d48
test: Ignore ui/target-feature-gate on sparc and sparc64
glaubitz Dec 19, 2018
036ce5c
Fix compiletest `trim` deprecation warnings
phansch Dec 19, 2018
90726e1
suggest similar lint names for unknown lints
euclio Dec 19, 2018
7b6cf6e
Stabilize Vec(Deque)::resize_with
scottmcm Dec 20, 2018
fb18dda
Add DoubleEndedIterator::nth_back
Dec 14, 2018
66bb34c
Update src/libcore/num/mod.rs
dtolnay Dec 20, 2018
455bc95
fix nits
ubsan Dec 20, 2018
0b0a00c
new --static-root-path flag for controlling static file locations
QuietMisdreavus Dec 20, 2018
8dc8d7a
split extra_scripts to handle root_path shenanigans
QuietMisdreavus Dec 20, 2018
edd08e0
Optimize away a move
Zoxc Dec 6, 2018
4f30a24
Inline tweaks
Zoxc Dec 5, 2018
8c40aed
Fix feature gate to point to 1.32.0 for `path_from_str`
otavio Dec 21, 2018
87c8cdd
Stabilize #[repr(packed(N))]
cramertj Dec 21, 2018
e5e19d9
Remove unstable-book repr-packed entry
cramertj Dec 21, 2018
51e4c1f
Fixed typo in HashMap documentation
RyanMarcus Dec 21, 2018
34dc5c8
macro_literal_matcher was stabilized in 1.32; not 1.32.
Centril Dec 21, 2018
0203a1c
exhaustive_integer_patterns slipped 1.32; stabilized in 1.33.
Centril Dec 21, 2018
22b2bd8
Update migrate warning wording.
davidtwco Dec 21, 2018
2d6927e
Rollup merge of #56802 - clarcharr:nth_back, r=alexcrichton
kennytm Dec 22, 2018
a92e21c
Rollup merge of #56909 - dlrobertson:fix_56762, r=estebank
kennytm Dec 22, 2018
beaf071
Rollup merge of #56914 - glaubitz:ignore-tests, r=alexcrichton
kennytm Dec 22, 2018
54d4e26
Rollup merge of #56919 - oli-obk:null_ref_array_tuple, r=RalfJung
kennytm Dec 22, 2018
660eca6
Rollup merge of #56933 - clarcharr:xpy_progress, r=Mark-Simulacrum
kennytm Dec 22, 2018
314e61f
Rollup merge of #56936 - ubsan:euclidean_div_rem, r=dtolnay
kennytm Dec 22, 2018
14ebca5
Rollup merge of #56941 - euclio:deny-libstd-resolution-failures, r=Qu…
kennytm Dec 22, 2018
1c76a2f
Rollup merge of #56967 - GuillaumeGomez:regen-search-index, r=QuietMi…
kennytm Dec 22, 2018
22dfa2b
Rollup merge of #56970 - Firstyear:mem_uninit_doc_ptr_drop, r=Manishe…
kennytm Dec 22, 2018
de2ba78
Rollup merge of #56973 - RalfJung:miri-trace, r=oli-obk
kennytm Dec 22, 2018
10d949a
Rollup merge of #56979 - VardhanThigle:Vardhan/rust-sgx-unwind-suppor…
kennytm Dec 22, 2018
40dc787
Rollup merge of #56981 - RalfJung:miri-infallible-alloc, r=oli-obk
kennytm Dec 22, 2018
afe572b
Rollup merge of #56984 - ljedrz:dropck_outlives_tweaks, r=oli-obk
kennytm Dec 22, 2018
10e4330
Rollup merge of #56989 - phansch:fix_compiletest_trim_deprecations, r…
kennytm Dec 22, 2018
7bb40eb
Rollup merge of #56992 - euclio:unknown-lint-suggestion, r=oli-obk
kennytm Dec 22, 2018
5ba6a34
Rollup merge of #57002 - scottmcm:stabilize-resize_with, r=rkruppe
kennytm Dec 22, 2018
4446c65
Rollup merge of #57011 - QuietMisdreavus:static-root-path, r=Guillaum…
kennytm Dec 22, 2018
9b2331d
Rollup merge of #57027 - Zoxc:query-perf5, r=michaelwoerister
kennytm Dec 22, 2018
5e727a4
Rollup merge of #57034 - Zoxc:query-perf8, r=michaelwoerister
kennytm Dec 22, 2018
e4430e0
Rollup merge of #57040 - otavio:topic/adjust-path_from_str-feature-ga…
kennytm Dec 22, 2018
60b4ea0
Rollup merge of #57049 - cramertj:repr-packed, r=Centril
kennytm Dec 22, 2018
bba398e
Rollup merge of #57050 - RyanMarcus:master, r=zackmdavis
kennytm Dec 22, 2018
5ffd1a6
Rollup merge of #57052 - Centril:fix-eip-stable-version, r=varkor
kennytm Dec 22, 2018
26842ae
Rollup merge of #57039 - davidtwco:migrate-warning-wording, r=pnkfelix
kennytm Dec 22, 2018
628c6d8
Rollup merge of #56945 - JohnHeitmann:rustdoc-js-tester-fix, r=Guilla…
kennytm Dec 22, 2018
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
8 changes: 4 additions & 4 deletions src/librustc_mir/interpret/eval_context.rs
Original file line number Diff line number Diff line change
@@ -422,7 +422,7 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tc
return_to_block: StackPopCleanup,
) -> EvalResult<'tcx> {
if self.stack.len() > 1 { // FIXME should be "> 0", printing topmost frame crashes rustc...
debug!("PAUSING({}) {}", self.cur_frame(), self.frame().instance);
info!("PAUSING({}) {}", self.cur_frame(), self.frame().instance);
}
::log_settings::settings().indentation += 1;

@@ -491,7 +491,7 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tc
}

if self.stack.len() > 1 { // FIXME no check should be needed, but some instances ICE
debug!("ENTERING({}) {}", self.cur_frame(), self.frame().instance);
info!("ENTERING({}) {}", self.cur_frame(), self.frame().instance);
}

if self.stack.len() > self.tcx.sess.const_eval_stack_frame_limit {
@@ -503,7 +503,7 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tc

pub(super) fn pop_stack_frame(&mut self) -> EvalResult<'tcx> {
if self.stack.len() > 1 { // FIXME no check should be needed, but some instances ICE
debug!("LEAVING({}) {}", self.cur_frame(), self.frame().instance);
info!("LEAVING({}) {}", self.cur_frame(), self.frame().instance);
}
::log_settings::settings().indentation -= 1;
let frame = self.stack.pop().expect(
@@ -557,7 +557,7 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tc
}

if self.stack.len() > 1 { // FIXME should be "> 0", printing topmost frame crashes rustc...
debug!("CONTINUING({}) {}", self.cur_frame(), self.frame().instance);
info!("CONTINUING({}) {}", self.cur_frame(), self.frame().instance);
}

Ok(())
6 changes: 3 additions & 3 deletions src/librustc_mir/interpret/step.rs
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
}

fn statement(&mut self, stmt: &mir::Statement<'tcx>) -> EvalResult<'tcx> {
debug!("{:?}", stmt);
info!("{:?}", stmt);

use rustc::mir::StatementKind::*;

@@ -293,7 +293,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
}

fn terminator(&mut self, terminator: &mir::Terminator<'tcx>) -> EvalResult<'tcx> {
debug!("{:?}", terminator.kind);
info!("{:?}", terminator.kind);
self.tcx.span = terminator.source_info.span;
self.memory.tcx.span = terminator.source_info.span;

@@ -303,7 +303,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
if !self.stack.is_empty() {
// This should change *something*
debug_assert!(self.cur_frame() != old_stack || self.frame().block != old_bb);
debug!("// {:?}", self.frame().block);
info!("// {:?}", self.frame().block);
}
Ok(())
}