about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2018-08-24 02:21:52 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2018-08-24 02:21:52 +0300
commit6fdb400ff2a12ff6d96532be3766ec4b3cf12054 (patch)
tree94a662d82630b75e659a1b9abcf41c358b9d26c5
parent5ce5e0860634258205c313879cb81a125aef4fcb (diff)
downloadrust-6fdb400ff2a12ff6d96532be3766ec4b3cf12054.tar.gz
rust-6fdb400ff2a12ff6d96532be3766ec4b3cf12054.zip
Revert "hygiene: Make sure expansion info is set at most once for a given `Mark`"
This reverts commit b15785b67133b5017f141d1fda1dd3dcf331b4b4.
-rw-r--r--src/libsyntax_pos/hygiene.rs9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/libsyntax_pos/hygiene.rs b/src/libsyntax_pos/hygiene.rs
index 364c640debb..99342f36236 100644
--- a/src/libsyntax_pos/hygiene.rs
+++ b/src/libsyntax_pos/hygiene.rs
@@ -108,14 +108,7 @@ impl Mark {
 
     #[inline]
     pub fn set_expn_info(self, info: ExpnInfo) {
-        HygieneData::with(|data| {
-            let old_info = &mut data.marks[self.0 as usize].expn_info;
-            if let Some(old_info) = old_info {
-                panic!("expansion info is reset for the mark {}\nold: {:#?}\nnew: {:#?}",
-                       self.0, old_info, info);
-            }
-            *old_info = Some(info);
-        })
+        HygieneData::with(|data| data.marks[self.0 as usize].expn_info = Some(info))
     }
 
     #[inline]