Skip to content

Commit a5a9729

Browse files
committed
auto merge of #347 : alexcrichton/cargo/snapshots, r=new
2 parents 9e61b47 + 77464f8 commit a5a9729

File tree

2 files changed

+42
-33
lines changed

2 files changed

+42
-33
lines changed

src/cargo/ops/cargo_rustc/layout.rs

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,48 @@
33
//! The directory layout is a little tricky at times, hence a separate file to
44
//! house this logic. The current layout looks like this:
55
//!
6-
//! # This is the root directory for all output, the top-level package
7-
//! # places all of its output here.
8-
//! target/
6+
//! ```ignore
7+
//! # This is the root directory for all output, the top-level package
8+
//! # places all of its output here.
9+
//! target/
910
//!
10-
//! # This is the root directory for all output of *dependencies*
11-
//! deps/
11+
//! # This is the root directory for all output of *dependencies*
12+
//! deps/
1213
//!
13-
//! # This is the location at which the output of all custom build
14-
//! # commands are rooted
15-
//! native/
14+
//! # This is the location at which the output of all custom build
15+
//! # commands are rooted
16+
//! native/
1617
//!
17-
//! # Each package gets its own directory for where its output is
18-
//! # placed. We can't track exactly what's getting put in here, so
19-
//! # we just assume that all relevant output is in these
20-
//! # directories.
21-
//! $pkg1/
22-
//! $pkg2/
23-
//! $pkg3/
18+
//! # Each package gets its own directory for where its output is
19+
//! # placed. We can't track exactly what's getting put in here, so
20+
//! # we just assume that all relevant output is in these
21+
//! # directories.
22+
//! $pkg1/
23+
//! $pkg2/
24+
//! $pkg3/
2425
//!
25-
//! # Hidden directory that holds all of the fingerprint files for all
26-
//! # packages
27-
//! .fingerprint/
26+
//! # Hidden directory that holds all of the fingerprint files for all
27+
//! # packages
28+
//! .fingerprint/
2829
//!
29-
//! # This is a temporary directory as part of the build process. When a
30-
//! # build starts, it initially moves the old `deps` directory to this
31-
//! # location. This is done to ensure that there are no stale artifacts
32-
//! # lying around in the build directory which may cause a build to
33-
//! # succeed where it would fail elsewhere.
34-
//! #
35-
//! # If a package is determined to be fresh, its files are moved out of
36-
//! # this directory and back into `deps`.
37-
//! old-deps/
30+
//! # This is a temporary directory as part of the build process. When a
31+
//! # build starts, it initially moves the old `deps` directory to this
32+
//! # location. This is done to ensure that there are no stale artifacts
33+
//! # lying around in the build directory which may cause a build to
34+
//! # succeed where it would fail elsewhere.
35+
//! #
36+
//! # If a package is determined to be fresh, its files are moved out of
37+
//! # this directory and back into `deps`.
38+
//! old-deps/
3839
//!
39-
//! # Similar to old-deps, this is where all of the output under
40-
//! # `target/` is moved at the start of a build.
41-
//! old-root/
40+
//! # Similar to old-deps, this is where all of the output under
41+
//! # `target/` is moved at the start of a build.
42+
//! old-root/
4243
//!
43-
//! # Same as the two above old directories
44-
//! old-native/
45-
//! old-fingerprint/
44+
//! # Same as the two above old directories
45+
//! old-native/
46+
//! old-fingerprint/
47+
//! ```
4648
4749
use std::io;
4850
use std::io::{fs, IoResult};

src/snapshots.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2014-08-08
2+
linux-i386 44207002e96c4f1309af70673966ee1e67938f5e
3+
linux-x86_64 5dc5e5aa575814af2d4e40e9dcdca2c55b594bd1
4+
macos-i386 5d1924057a0d56d033f32680f4b393cdd9c6805a
5+
macos-x86_64 65462ea1e48cb4b4c57ff7e947cd2cc26a8f2723
6+
winnt-i386 a481b15d35ab2e1d1dcd2f181a2566e097604ffc
7+
18
2014-08-06
29
linux-i386 eb7c2a87b30db077f6f1c4ea724ebd0e5cc07d1c
310
linux-x86_64 1672657adb9012df2912bbb2f43466f1c6817e55

0 commit comments

Comments
 (0)