From 751b96813111e1d25331b6690155feecc3491c5c Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Tue, 1 Oct 2019 12:03:36 +0000
Subject: [PATCH] servo: Merge #17080 - Update rustc (from jdm:updaterust);
 r=nox

This brings in https://github.com/rust-lang/rust/issues/39160 which significantly improves the default debugging experience on macOS.

Source-Repo: https://github.com/servo/servo
Source-Revision: ad4a5411a9620cee5cd93d5fe1a3dbad02cc0812

UltraBlame original commit: 2b4844f7a38ef8973b937690fc041ca63c496c2f
---
 servo/components/profile/mem.rs | 96 ++++++++++++++++-----------------
 servo/rust-commit-hash          |  2 +-
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/servo/components/profile/mem.rs b/servo/components/profile/mem.rs
index af2e8e7985178..392890050d789 100644
--- a/servo/components/profile/mem.rs
+++ b/servo/components/profile/mem.rs
@@ -3865,54 +3865,6 @@ usize
 {
 None
 }
-/
-/
-Like
-std
-:
-:
-macros
-:
-:
-try
-!
-but
-for
-Option
-<
->
-.
-macro_rules
-!
-option_try
-(
-(
-e
-:
-expr
-)
-=
->
-(
-match
-e
-{
-Some
-(
-e
-)
-=
->
-e
-None
-=
->
-return
-None
-}
-)
-)
-;
 #
 [
 cfg
@@ -3995,6 +3947,54 @@ io
 :
 Read
 ;
+/
+/
+Like
+std
+:
+:
+macros
+:
+:
+try
+!
+but
+for
+Option
+<
+>
+.
+macro_rules
+!
+option_try
+(
+(
+e
+:
+expr
+)
+=
+>
+(
+match
+e
+{
+Some
+(
+e
+)
+=
+>
+e
+None
+=
+>
+return
+None
+}
+)
+)
+;
 let
 mut
 f
diff --git a/servo/rust-commit-hash b/servo/rust-commit-hash
index 22a3daa7544d9..ac9c5bcdd5567 100644
--- a/servo/rust-commit-hash
+++ b/servo/rust-commit-hash
@@ -1 +1 @@
-e17a1227ac779a181b2839998e26a7e4e434c2a0
+03bed655142dd5e42ba4539de53b3663d8a123e0