Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 36a50c2

Browse files
committedNov 9, 2018
Auto merge of #55803 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 17 pull requests Successful merges: - #55576 (Clarify error message for -C opt-level) - #55633 (Support memcpy/memmove with differing src/dst alignment) - #55638 (Fix ICE in msg_span_from_free_region on ReEmpty) - #55659 (rustc: Delete grouping logic from the musl target) - #55719 (Sidestep link error from rustfix'ed code by using a *defined* static.) - #55736 (Elide anon lifetimes in conflicting impl note) - #55739 (Consume optimization fuel from the MIR inliner) - #55742 (Avoid panic when matching function call) - #55753 (borrow_set: remove a helper function and a clone it uses) - #55755 (Improve creation of 3 IndexVecs) - #55758 ([regression - rust2018]: unused_mut lint false positives on nightly) - #55760 (Remove intermediate font specs) - #55761 (mir: remove a hacky recursive helper function) - #55774 (wasm32-unknown-emscripten expects the rust_eh_personality symbol) - #55777 (Use `Lit` rather than `P<Lit>` in `ast::ExprKind`.) - #55783 (Deprecate mpsc channel selection) - #55788 (rustc: Request ansi colors if stderr isn't a tty) Failed merges: r? @ghost
2 parents 653da4f + d293d1e commit 36a50c2

File tree

47 files changed

+403
-172
lines changed

Some content is hidden

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

47 files changed

+403
-172
lines changed
 

‎src/libpanic_abort/lib.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@ pub unsafe extern fn __rust_start_panic(_payload: usize) -> u32 {
9797
pub mod personalities {
9898
#[no_mangle]
9999
#[cfg(not(any(
100-
target_arch = "wasm32",
100+
all(
101+
target_arch = "wasm32",
102+
not(target_os = "emscripten"),
103+
),
101104
all(
102105
target_os = "windows",
103106
target_env = "gnu",

‎src/librustc/hir/lowering.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3705,7 +3705,7 @@ impl<'a> LoweringContext<'a> {
37053705
let ohs = P(self.lower_expr(ohs));
37063706
hir::ExprKind::Unary(op, ohs)
37073707
}
3708-
ExprKind::Lit(ref l) => hir::ExprKind::Lit(P((**l).clone())),
3708+
ExprKind::Lit(ref l) => hir::ExprKind::Lit(P((*l).clone())),
37093709
ExprKind::Cast(ref expr, ref ty) => {
37103710
let expr = P(self.lower_expr(expr));
37113711
hir::ExprKind::Cast(expr, self.lower_ty(ty, ImplTraitContext::disallowed()))

0 commit comments

Comments
 (0)
Please sign in to comment.