New upstream version 0.52.0

[cargo.git] / vendor / redox_syscall / debian / patches / no-nightly.patch

diff --git a/vendor/redox_syscall/debian/patches/no-nightly.patch b/vendor/redox_syscall/debian/patches/no-nightly.patch
index 0ecf4f5bc608ab64c59a5da7273f58f90c6f29a2..99d858b42804cf54270798aa8d1f47144f489c95 100644 (file)
--- a/vendor/redox_syscall/debian/patches/no-nightly.patch
+++ b/vendor/redox_syscall/debian/patches/no-nightly.patch
@@ -17,9 +17,11 @@ diff --git a/src/lib.rs b/src/lib.rs
 index 6b8d130..42526f0 100644
 --- a/src/lib.rs
 +++ b/src/lib.rs
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
+-#![feature(asm)]
 -#![feature(llvm_asm)]
--#![feature(const_fn)]
+-#![feature(const_fn)] // see https://github.com/rust-lang/rfcs/pull/2632
++#![cfg_attr(nightly, feature(asm))]
 +#![cfg_attr(nightly, feature(llvm_asm))]
 +#![cfg_attr(nightly, feature(const_fn))]
  #![cfg_attr(not(test), no_std)]