Remove the push_unsafe! and pop_unsafe! macros. · rust-lang/rust@d399098 (original) (raw)

9 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -1489,8 +1489,6 @@ pub fn lower_block_check_mode(_lctx: &LoweringContext, b: &BlockCheckMode) -> hi
1489 1489 match *b {
1490 1490 DefaultBlock => hir::DefaultBlock,
1491 1491 UnsafeBlock(u) => hir::UnsafeBlock(lower_unsafe_source(_lctx, u)),
1492 -PushUnsafeBlock(u) => hir::PushUnsafeBlock(lower_unsafe_source(_lctx, u)),
1493 -PopUnsafeBlock(u) => hir::PopUnsafeBlock(lower_unsafe_source(_lctx, u)),
1494 1492 }
1495 1493 }
1496 1494
Original file line number Diff line number Diff line change
@@ -765,8 +765,6 @@ pub type SpannedIdent = Spanned;
765 765 pub enum BlockCheckMode {
766 766 DefaultBlock,
767 767 UnsafeBlock(UnsafeSource),
768 -PushUnsafeBlock(UnsafeSource),
769 -PopUnsafeBlock(UnsafeSource),
770 768 }
771 769
772 770 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)]
Original file line number Diff line number Diff line change
@@ -544,12 +544,6 @@ fn initial_syntax_expander_table<'feat>(ecfg: &expand::ExpansionConfig<'feat>)
544 544 syntax_expanders.insert(intern("cfg"),
545 545 builtin_normal_expander(
546 546 ext::cfg::expand_cfg));
547 - syntax_expanders.insert(intern("push_unsafe"),
548 -builtin_normal_expander(
549 - ext::pushpop_safe::expand_push_unsafe));
550 - syntax_expanders.insert(intern("pop_unsafe"),
551 -builtin_normal_expander(
552 - ext::pushpop_safe::expand_pop_unsafe));
553 547 syntax_expanders.insert(intern("trace_macros"),
554 548 builtin_normal_expander(
555 549 ext::trace_macros::expand_trace_macros));
Original file line number Diff line number Diff line change
@@ -121,7 +121,6 @@ pub mod ext {
121 121 pub mod log_syntax;
122 122 pub mod mtwt;
123 123 pub mod quote;
124 -pub mod pushpop_safe;
125 124 pub mod source_util;
126 125 pub mod trace_macros;
127 126
Original file line number Diff line number Diff line change
@@ -1671,8 +1671,8 @@ impl<'a> State<'a> {
1671 1671 attrs: &[ast::Attribute],
1672 1672 close_box: bool) -> io::Result<()> {
1673 1673 match blk.rules {
1674 - ast::UnsafeBlock(..) | ast::PushUnsafeBlock(..) => try!(self.word_space("unsafe")),
1675 - ast::DefaultBlock | ast::PopUnsafeBlock(..) => ()
1674 + ast::UnsafeBlock(..) => try!(self.word_space("unsafe")),
1675 + ast::DefaultBlock => ()
1676 1676 }
1677 1677 try!(self.maybe_print_comment(blk.span.lo));
1678 1678 try!(self.ann.pre(self, NodeBlock(blk)));