---

yaml
---
r: 140461
b: refs/heads/try2
c: 8f2d71a
h: refs/heads/master
i:
  140459: d28672b
v: v3

Author: thestinger

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 29a2a1ecd1fe33260a9390dd05899daf6a2ba69b
+refs/heads/try2: 8f2d71ac009e1f93c14266ecebb1c105a0a907e3
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/tutorial-ffi.md

@@ -150,11 +150,7 @@ wrapping `malloc` and `free`:
 
 ~~~~
 use core::libc::{c_void, size_t, malloc, free};
-
-#[abi = "rust-intrinsic"]
-extern "rust-intrinsic" mod rusti {
-    fn init<T>() -> T;
-}
+use core::unstable::intrinsics;
 
 // a wrapper around the handle returned by the foreign code
 pub struct Unique<T> {
@@ -166,7 +162,8 @@ pub impl<'self, T: Owned> Unique<T> {
         unsafe {
             let ptr = malloc(core::sys::size_of::<T>() as size_t) as *mut T;
             assert!(!ptr::is_null(ptr));
-            *ptr = value;
+            // `*ptr` is uninitialized, and `*ptr = value` would attempt to destroy it
+            intrinsics::move_val_init(&mut *ptr, value);
             Unique{ptr: ptr}
         }
     }
@@ -186,7 +183,7 @@ pub impl<'self, T: Owned> Unique<T> {
 impl<T: Owned> Drop for Unique<T> {
     fn finalize(&self) {
         unsafe {
-            let mut x = rusti::init(); // dummy value to swap in
+            let mut x = intrinsics::init(); // dummy value to swap in
             x <-> *self.ptr; // moving the object out is needed to call the destructor
             free(self.ptr as *c_void)
         }

branches/try2/src/rt/rust_android_dummy.cpp

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifdef __ANDROID__
-
 #include "rust_android_dummy.h"
 #include <math.h>
 #include <errno.h>
 
+#ifdef __ANDROID__
+
 int backtrace(void **array, int size) { return 0; }
 
 char **backtrace_symbols(void *const *array, int size) { return 0; }
@@ -59,21 +59,7 @@ extern "C" void srand()
 extern "C" void atof()
 {
 }
-
 extern "C" void tgammaf()
 {
 }
-
-extern "C" int glob(const char *pattern,
-                    int flags,
-                    int (*errfunc) (const char *epath, int eerrno),
-                    glob_t *pglob)
-{
-    return 0;
-}
-
-extern "C" void globfree(glob_t *pglob)
-{
-}
-
 #endif

branches/try2/src/rt/rust_android_dummy.h

@@ -11,27 +11,4 @@ char **backtrace_symbols (void *__const *__array, int __size);
 
 void backtrace_symbols_fd (void *__const *__array, int __size, int __fd);
 
-#include <sys/types.h>
-
-struct stat;
-typedef struct {
-    size_t gl_pathc;    /* Count of total paths so far. */
-    size_t gl_matchc;   /* Count of paths matching pattern. */
-    size_t gl_offs;     /* Reserved at beginning of gl_pathv. */
-    int gl_flags;       /* Copy of flags parameter to glob. */
-    char **gl_pathv;    /* List of paths matching pattern. */
-                /* Copy of errfunc parameter to glob. */
-    int (*gl_errfunc)(const char *, int);
-
-    /*
-     * Alternate filesystem access methods for glob; replacement
-     * versions of closedir(3), readdir(3), opendir(3), stat(2)
-     * and lstat(2).
-     */
-    void (*gl_closedir)(void *);
-    struct dirent *(*gl_readdir)(void *);
-    void *(*gl_opendir)(const char *);
-    int (*gl_lstat)(const char *, struct stat *);
-} glob_t;
-
 #endif