diff options
| author | bors <bors@rust-lang.org> | 2017-02-14 07:06:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-02-14 07:06:25 +0000 |
| commit | 48bc08247a7b4a5579437df54ca3f4a3fb25ce8d (patch) | |
| tree | 8fbb2097c8787f3ad9d9ae638bab427143e01c8f /src/vendor/toml/tests/valid/table-array-implicit.json | |
| parent | 55013cddefbd8e2616370a72df785c20880189ce (diff) | |
| parent | d29f0bc8fa166117e62b1fa2969dd31f415fd887 (diff) | |
| download | rust-48bc08247a7b4a5579437df54ca3f4a3fb25ce8d.tar.gz rust-48bc08247a7b4a5579437df54ca3f4a3fb25ce8d.zip | |
Auto merge of #39728 - eddyb:vendeur-tres-bien, r=alexcrichton
Automate vendoring by invoking cargo-vendor when building src dist tarballs. This avoids #39633 bringing the `src/vendor` checked into git by #37524, past 200,000 lines of code. I believe the strategy of having rustbuild run `cargo vendor` during the `dist src` step is sound. However, the only way to be sure `cargo-vendor` exists is to run `cargo install --force cargo-vendor`, which will recompile it every time (not passing `--force` means you can't tell between "already exists" and "build error"). ~~This is quite suboptimal and I'd like to somehow do it in each `Dockerfile` that would need it.~~ * [ ] Cache `CARGO_HOME` (i.e. `~/.cargo`) between CI runs * `bin/cargo-vendor` and the actual caches are the relevant bits * [x] Do not build `cargo-vendor` all the time * ~~Maybe detect `~/.cargo/bin/cargo-vendor` already exists?~~ * ~~Could also try to build it in a `Dockerfile` but do we have `cargo`/`rustc` there?~~ * Final solution: check `cargo install --list` for a line starting with `cargo-vendor ` cc @rust-lang/tools
Diffstat (limited to 'src/vendor/toml/tests/valid/table-array-implicit.json')
| -rw-r--r-- | src/vendor/toml/tests/valid/table-array-implicit.json | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/vendor/toml/tests/valid/table-array-implicit.json b/src/vendor/toml/tests/valid/table-array-implicit.json deleted file mode 100644 index 32e464012d6..00000000000 --- a/src/vendor/toml/tests/valid/table-array-implicit.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "albums": { - "songs": [ - {"name": {"type": "string", "value": "Glory Days"}} - ] - } -} |
