Skip to content

Commit d8ba8b0

Browse files
committed
rollup merge of #22459: alexcrichton/feature-names
Conflicts: src/rustbook/main.rs
2 parents c166fd3 + a2ebb24 commit d8ba8b0

File tree

18 files changed

+36
-37
lines changed

18 files changed

+36
-37
lines changed

src/compiletest/compiletest.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#![feature(box_syntax)]
1414
#![feature(collections)]
1515
#![feature(int_uint)]
16-
#![feature(io)]
17-
#![feature(path)]
16+
#![feature(old_io)]
17+
#![feature(old_path)]
1818
#![feature(rustc_private)]
1919
#![feature(unboxed_closures)]
2020
#![feature(std_misc)]

src/libgraphviz/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
#![feature(int_uint)]
277277
#![feature(collections)]
278278
#![feature(core)]
279-
#![feature(io)]
279+
#![feature(old_io)]
280280

281281
use self::LabelText::*;
282282

src/liblog/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
#![feature(box_syntax)]
172172
#![feature(int_uint)]
173173
#![feature(core)]
174-
#![feature(io)]
174+
#![feature(old_io)]
175175
#![feature(std_misc)]
176176
#![feature(env)]
177177

src/librbml/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#![feature(collections)]
2929
#![feature(core)]
3030
#![feature(int_uint)]
31-
#![feature(io)]
31+
#![feature(old_io)]
3232
#![feature(rustc_private)]
3333
#![feature(staged_api)]
3434

src/librustc/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
#![feature(core)]
3030
#![feature(hash)]
3131
#![feature(int_uint)]
32-
#![feature(io)]
32+
#![feature(old_io)]
3333
#![feature(libc)]
3434
#![feature(env)]
35-
#![feature(path)]
35+
#![feature(old_path)]
3636
#![feature(quote)]
3737
#![feature(rustc_diagnostic_macros)]
3838
#![feature(rustc_private)]

src/librustc_back/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
#![feature(core)]
3636
#![feature(hash)]
3737
#![feature(int_uint)]
38-
#![feature(io)]
38+
#![feature(old_io)]
3939
#![feature(os)]
40-
#![feature(path)]
40+
#![feature(old_path)]
4141
#![feature(rustc_private)]
4242
#![feature(staged_api)]
4343
#![feature(env)]

src/librustc_driver/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
#![feature(core)]
2929
#![feature(env)]
3030
#![feature(int_uint)]
31-
#![feature(io)]
31+
#![feature(old_io)]
3232
#![feature(libc)]
3333
#![feature(os)]
34-
#![feature(path)]
34+
#![feature(old_path)]
3535
#![feature(quote)]
3636
#![feature(rustc_diagnostic_macros)]
3737
#![feature(rustc_private)]

src/librustc_llvm/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#![feature(int_uint)]
3030
#![feature(libc)]
3131
#![feature(link_args)]
32-
#![feature(path)]
32+
#![feature(old_path)]
3333
#![feature(staged_api)]
3434
#![feature(std_misc)]
3535

src/librustc_trans/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
#![feature(core)]
3131
#![feature(hash)]
3232
#![feature(int_uint)]
33-
#![feature(io)]
33+
#![feature(old_io)]
3434
#![feature(env)]
3535
#![feature(libc)]
36-
#![feature(path)]
36+
#![feature(old_path)]
3737
#![feature(quote)]
3838
#![feature(rustc_diagnostic_macros)]
3939
#![feature(rustc_private)]

src/librustdoc/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
#![feature(env)]
2626
#![feature(hash)]
2727
#![feature(int_uint)]
28-
#![feature(io)]
28+
#![feature(old_io)]
2929
#![feature(libc)]
3030
#![feature(os)]
31-
#![feature(path)]
31+
#![feature(old_path)]
3232
#![feature(rustc_private)]
3333
#![feature(staged_api)]
3434
#![feature(std_misc)]

0 commit comments

Comments
 (0)