diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 15:16:22 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 17:26:59 -0800 |
| commit | d8ba8b00a7be7c9aba8fb5a6c0174e526c5a3d4d (patch) | |
| tree | e5174e340d1249a638ed4b75fa52d22309bf8e66 /src/librustc_llvm | |
| parent | c166fd3041208bda4a55e1fcaaf14a38cc3d6158 (diff) | |
| parent | a2ebb24ee6cc76791ef834cb2d17ecac95756499 (diff) | |
| download | rust-d8ba8b00a7be7c9aba8fb5a6c0174e526c5a3d4d.tar.gz rust-d8ba8b00a7be7c9aba8fb5a6c0174e526c5a3d4d.zip | |
rollup merge of #22459: alexcrichton/feature-names
Conflicts: src/rustbook/main.rs
Diffstat (limited to 'src/librustc_llvm')
| -rw-r--r-- | src/librustc_llvm/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs index 1136d12a2b1..aa90d7c851b 100644 --- a/src/librustc_llvm/lib.rs +++ b/src/librustc_llvm/lib.rs @@ -29,7 +29,7 @@ #![feature(int_uint)] #![feature(libc)] #![feature(link_args)] -#![feature(path)] +#![feature(old_path)] #![feature(staged_api)] #![feature(std_misc)] |