]> git.lizzy.rs Git - rust.git/commitdiff
Revert "hygiene: Make sure expansion info is set at most once for a given `Mark`"
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>
Thu, 23 Aug 2018 23:21:52 +0000 (02:21 +0300)
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>
Thu, 23 Aug 2018 23:21:52 +0000 (02:21 +0300)
This reverts commit b15785b67133b5017f141d1fda1dd3dcf331b4b4.

src/libsyntax_pos/hygiene.rs

index 364c640debb16caddb1319464945b64b75a5bf7d..99342f362360b90b048d45a6bd2471f7c3ae1ebc 100644 (file)
@@ -108,14 +108,7 @@ pub fn expn_info(self) -> Option<ExpnInfo> {
 
     #[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]