Skip to content

Commit b046a5c

Browse files
author
Jakub Wieczorek
committed
---
yaml --- r: 138165 b: refs/heads/try c: dbc4a4b h: refs/heads/master i: 138163: 6c4c549 v: v3
1 parent 6fc5b68 commit b046a5c

File tree

5 files changed

+193
-213
lines changed

5 files changed

+193
-213
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: b6e0d3a5bf4c88650a22f605f822e02c6b163580
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
5-
refs/heads/try: c2e8f3b481fd41f801c3e79d43861e8e86cd1a44
5+
refs/heads/try: dbc4a4b53b91e687429db622626a6eb221252b04
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/lib.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@ This API is completely unstable and subject to change.
2929
html_root_url = "http://doc.rust-lang.org/nightly/")]
3030

3131
#![allow(deprecated)]
32-
#![allow(unknown_features)]
33-
#![feature(macro_rules, globs, struct_variant, quote)]
34-
#![feature(default_type_params, phase, unsafe_destructor, slicing_syntax)]
35-
32+
#![feature(default_type_params, globs, if_let, import_shadowing, macro_rules, phase, quote)]
33+
#![feature(slicing_syntax, struct_variant, unsafe_destructor)]
3634
#![feature(rustc_diagnostic_macros)]
37-
#![feature(import_shadowing)]
3835

3936
extern crate arena;
4037
extern crate debug;
@@ -97,7 +94,6 @@ pub mod middle {
9794
pub mod intrinsicck;
9895
pub mod lang_items;
9996
pub mod liveness;
100-
pub mod macros;
10197
pub mod mem_categorization;
10298
pub mod pat_util;
10399
pub mod privacy;

branches/try/src/librustc/middle/macros.rs

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)