diff options
| author | John Hodge <tpg@ucc.asn.au> | 2019-07-13 18:53:40 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2019-07-13 18:53:40 +0800 |
| commit | b11367d979f3b1f4eb84e968adedc50cbbf2b1d6 (patch) | |
| tree | da1e041a7bfd82d1f4d31418011c394806b3c75c | |
| parent | 7c96c138d0ad2a3d223990e769441d6ec5074f1f (diff) | |
| download | mrust-b11367d979f3b1f4eb84e968adedc50cbbf2b1d6.tar.gz | |
rustc patch - Fix `const` function rule violation
| -rw-r--r-- | rustc-1.29.0-src.patch | 6 |
1 files 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<T>(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<T>(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 |