summaryrefslogtreecommitdiff
path: root/rust_src.patch
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2017-07-17 13:17:31 +0800
committerJohn Hodge <tpg@ucc.asn.au>2017-07-17 13:19:53 +0800
commitf37b4f2bde9d2fa40e8771741f44aceb70eaa994 (patch)
treefb5cc73d43a01e79f092ced7bbdd818d5f461626 /rust_src.patch
parent2afa9ed4303e574655a299e8dcbe8ebd3de6bea5 (diff)
downloadmrust-f37b4f2bde9d2fa40e8771741f44aceb70eaa994.tar.gz
Update patch
Diffstat (limited to 'rust_src.patch')
-rw-r--r--rust_src.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/rust_src.patch b/rust_src.patch
index ac479382..f49891a5 100644
--- a/rust_src.patch
+++ b/rust_src.patch
@@ -1,7 +1,7 @@
--- rustc-nightly/src/libcore/intrinsics.rs
+++ rustc-nightly/src/libcore/intrinsics.rs
-@@ -643,5 +643,9 @@
- pub fn drop_in_place<T: ?Sized>(to_drop: *mut T);
+@@ -678,5 +678,9 @@
+ pub fn min_align_of_val<T: ?Sized>(_: &T) -> usize;
+ /// Obtain the length of a slice pointer
+ #[cfg(rust_compiler="mrustc")]
@@ -10,9 +10,9 @@
/// Gets a static string slice containing the name of a type.
pub fn type_name<T: ?Sized>() -> &'static str;
---- rustc-nightly/src/libcore/slice.rs
-+++ rustc-nightly/src/libcore/slice.rs
-@@ -340,6 +340,8 @@
+--- rustc-nightly/src/libcore/slice/mod.rs
++++ rustc-nightly/src/libcore/slice/mod.rs
+@@ -413,6 +413,8 @@
#[inline]
fn len(&self) -> usize {
- unsafe {