---

yaml
---
r: 83847
b: refs/heads/try
c: 6ad1d0f
h: refs/heads/master
i:
  83845: fb96a66
  83843: e4cf733
  83839: 548a4d2
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: 8854b78b555d9a03a3b2ff248230696ec94e24c0
+refs/heads/try: 6ad1d0f861b02589ede7e06f1221bbe790ef31a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/doc/rustpkg.md

@@ -137,9 +137,6 @@ and builds it in any workspace(s) where it finds one.
 Supposing such packages are found in workspaces X, Y, and Z,
 the command leaves behind files in `X`'s, `Y`'s, and `Z`'s `build` directories,
 but not in their `lib` or `bin` directories.
-(The exception is when rustpkg fetches a package `foo`'s sources from a remote repository.
-In that case, it stores both the sources *and* the build artifacts for `foo`
-in the workspace that `foo` will install to (see ##install below)).
 
 ## clean
 
@@ -151,11 +148,7 @@ in the workspace that `foo` will install to (see ##install below)).
 If `RUST_PATH` is declared as an environment variable, then rustpkg installs the
 libraries and executables into the `lib` and `bin` subdirectories
 of the first entry in `RUST_PATH`.
-Otherwise, if the current working directory CWD is a workspace,
-it installs them into CWD's `lib` and `bin` subdirectories.
-Otherwise, if the current working directory is CWD,
-it installs them into the .rust/lib and .rust/bin subdirectories of CWD
-(creating them if necessary). 
+Otherwise, it installs them into `foo`'s `lib` and `bin` directories.
 
 ## test
 

branches/try/doc/tutorial-ffi.md

@@ -135,7 +135,7 @@ the true length after compression for setting the length.
 ~~~~ {.xfail-test}
 pub fn compress(src: &[u8]) -> ~[u8] {
     #[fixed_stack_segment]; #[inline(never)];
-    
+
     unsafe {
         let srclen = src.len() as size_t;
         let psrc = vec::raw::to_ptr(src);
@@ -157,7 +157,7 @@ format and `snappy_uncompressed_length` will retrieve the exact buffer size requ
 ~~~~ {.xfail-test}
 pub fn uncompress(src: &[u8]) -> Option<~[u8]> {
     #[fixed_stack_segment]; #[inline(never)];
-    
+
     unsafe {
         let srclen = src.len() as size_t;
         let psrc = vec::raw::to_ptr(src);
@@ -236,7 +236,7 @@ use std::libc::size_t;
 unsafe fn snappy_max_compressed_length(source_length: size_t) -> size_t {
     #[fixed_stack_segment]; #[inline(never)];
     return snappy_max_compressed_length(source_length);
-    
+
     #[link_args = "-lsnappy"]
     extern {
         fn snappy_max_compressed_length(source_length: size_t) -> size_t;
@@ -259,9 +259,9 @@ check that one of the following conditions holds:
 2. The call occurs inside of an `extern fn`;
 3. The call occurs within a stack closure created by some other
    safe fn.
-   
+
 All of these conditions ensure that you are running on a large stack
-segmented. However, they are sometimes too strict. If your application
+segment. However, they are sometimes too strict. If your application
 will be making many calls into C, it is often beneficial to promote
 the `#[fixed_stack_segment]` attribute higher up the call chain.  For
 example, the Rust compiler actually labels main itself as requiring a
@@ -298,7 +298,7 @@ impl<T: Send> Unique<T> {
     pub fn new(value: T) -> Unique<T> {
         #[fixed_stack_segment];
         #[inline(never)];
-        
+
         unsafe {
             let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;
             assert!(!ptr::is_null(ptr));
@@ -324,7 +324,7 @@ impl<T: Send> Drop for Unique<T> {
     fn drop(&mut self) {
         #[fixed_stack_segment];
         #[inline(never)];
-        
+
         unsafe {
             let x = intrinsics::init(); // dummy value to swap in
             // moving the object out is needed to call the destructor

branches/try/src/librustpkg/api.rs

@@ -16,8 +16,6 @@ use target::*;
 use version::Version;
 use workcache_support::*;
 
-pub use source_control::{safe_git_clone, git_clone_url};
-
 use std::os;
 use extra::arc::{Arc,RWArc};
 use extra::workcache;
@@ -70,27 +68,23 @@ pub fn build_lib(sysroot: Path, root: Path, name: ~str, version: Version,
                  lib: Path) {
     let cx = default_context(sysroot);
     let pkg_src = PkgSrc {
-        source_workspace: root.clone(),
-        build_in_destination: false,
-        destination_workspace: root.clone(),
-        start_dir: root.push("src").push(name),
-        id: PkgId{ version: version, ..PkgId::new(name)},
-        // n.b. This assumes the package only has one crate
-        libs: ~[mk_crate(lib)],
-        mains: ~[],
-        tests: ~[],
-        benchs: ~[]
-    };
+            workspace: root.clone(),
+            start_dir: root.push("src").push(name),
+            id: PkgId{ version: version, ..PkgId::new(name)},
+            // n.b. This assumes the package only has one crate
+            libs: ~[mk_crate(lib)],
+            mains: ~[],
+            tests: ~[],
+            benchs: ~[]
+        };
     pkg_src.build(&cx, ~[]);
 }
 
 pub fn build_exe(sysroot: Path, root: Path, name: ~str, version: Version,
                  main: Path) {
     let cx = default_context(sysroot);
     let pkg_src = PkgSrc {
-        source_workspace: root.clone(),
-        build_in_destination: false,
-        destination_workspace: root.clone(),
+        workspace: root.clone(),
         start_dir: root.push("src").push(name),
         id: PkgId{ version: version, ..PkgId::new(name)},
         libs: ~[],
@@ -106,7 +100,7 @@ pub fn build_exe(sysroot: Path, root: Path, name: ~str, version: Version,
 pub fn install_pkg(sysroot: Path, workspace: Path, name: ~str, version: Version) {
     let cx = default_context(sysroot);
     let pkgid = PkgId{ version: version, ..PkgId::new(name)};
-    cx.install(PkgSrc::new(workspace.clone(), workspace, false, pkgid), &Everything);
+    cx.install(PkgSrc::new(workspace, false, pkgid), &Everything);
 }
 
 fn mk_crate(p: Path) -> Crate {

branches/try/src/librustpkg/conditions.rs

@@ -50,7 +50,3 @@ condition! {
 condition! {
     pub failed_to_create_temp_dir: (~str) -> Path;
 }
-
-condition! {
-    pub git_checkout_failed: (~str, Path) -> ();
-}

branches/try/src/librustpkg/package_id.rs

@@ -102,7 +102,10 @@ impl PkgId {
     }
 
     pub fn prefixes_iter(&self) -> Prefixes {
-        prefixes_iter(&self.path)
+        Prefixes {
+            components: self.path.components().to_owned(),
+            remaining: ~[]
+        }
     }
 
     // This is the workcache function name for the *installed*
@@ -113,13 +116,6 @@ impl PkgId {
     }
 }
 
-pub fn prefixes_iter(p: &Path) -> Prefixes {
-    Prefixes {
-        components: p.components().to_owned(),
-        remaining: ~[]
-    }
-}
-
 struct Prefixes {
     priv components: ~[~str],
     priv remaining: ~[~str]