From b11367d979f3b1f4eb84e968adedc50cbbf2b1d6 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 13 Jul 2019 18:53:40 +0800 Subject: rustc patch - Fix `const` function rule violation --- rustc-1.29.0-src.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rustc-1.29.0-src.patch b/rustc-1.29.0-src.patch index bdfd15db..c4974757 100644 --- a/rustc-1.29.0-src.patch +++ b/rustc-1.29.0-src.patch @@ -19,10 +19,10 @@ - Repr { rust: self }.raw.len - } + #[cfg(not(rust_compiler="mrustc"))] -+ let rv = unsafe { Repr { rust: self }.raw.len }; ++ const fn len_inner(s: &[T]) -> usize { unsafe { Repr { rust: s }.raw.len } }; + #[cfg(rust_compiler="mrustc")] -+ let rv = unsafe { ::intrinsics::mrustc_slice_len(self) }; -+ rv ++ const fn len_inner(s: &[T]) -> usize { unsafe { ::intrinsics::mrustc_slice_len(s) } } ++ len_inner(self) } # Static-link rustc_codegen_llvm because mrustc doesn't have dylib support --- src/librustc_driver/Cargo.toml -- cgit v1.2.3