Commit 5dc0f40
authored
Rollup merge of #56224 - ehuss:update-cargo, r=alexcrichton
Update cargo
14 commits in b3d0b2e545b61d4cd08096911724b7d49d213f73..1ff5975b96b3d395bb962394596998dfb485f793
2018-11-15 19:13:04 +0000 to 2018-11-25 14:59:12 +0000
- Intern SourceId (rust-lang/cargo#6342)
- Tweak Layout to allow for non json file targets with internal "." (rust-lang/cargo#6255)
- Correct Target Directory command-line option (rust-lang/cargo#6343)
- Persistent data structures by im-rs (rust-lang/cargo#6336)
- Move command prelude into main library (rust-lang/cargo#6335)
- Distinguish custom build invocations (rust-lang/cargo#6331)
- Allow crate_type=bin examples to run (rust-lang/cargo#6330)
- Make verify-project honour unstable features (rust-lang/cargo#6326)
- Make autodiscovery disable inferred targets (rust-lang/cargo#6329)
- Add `c` alias for `check` (rust-lang/cargo#6218)
- Allow user aliases to override built-in aliases (rust-lang/cargo#6259)
- Fix renaming directory project using build scripts with cross-compiling. (rust-lang/cargo#6328)
- Fix add_plugin_deps-related tests. (rust-lang/cargo#6327)
- Add a glossary. (rust-lang/cargo#6321)2 files changed
+18
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
201 | 201 | | |
202 | 202 | | |
203 | 203 | | |
| 204 | + | |
204 | 205 | | |
205 | 206 | | |
206 | 207 | | |
| |||
978 | 979 | | |
979 | 980 | | |
980 | 981 | | |
| 982 | + | |
| 983 | + | |
| 984 | + | |
| 985 | + | |
| 986 | + | |
| 987 | + | |
| 988 | + | |
| 989 | + | |
| 990 | + | |
981 | 991 | | |
982 | 992 | | |
983 | 993 | | |
| |||
3038 | 3048 | | |
3039 | 3049 | | |
3040 | 3050 | | |
| 3051 | + | |
| 3052 | + | |
| 3053 | + | |
| 3054 | + | |
| 3055 | + | |
3041 | 3056 | | |
3042 | 3057 | | |
3043 | 3058 | | |
| |||
3331 | 3346 | | |
3332 | 3347 | | |
3333 | 3348 | | |
| 3349 | + | |
3334 | 3350 | | |
3335 | 3351 | | |
3336 | 3352 | | |
| |||
3482 | 3498 | | |
3483 | 3499 | | |
3484 | 3500 | | |
| 3501 | + | |
3485 | 3502 | | |
3486 | 3503 | | |
3487 | 3504 | | |
| |||
- Cargo.toml+1
- src/bin/cargo/cli.rs+21-12
- src/bin/cargo/commands/build.rs+2-1
- src/bin/cargo/commands/check.rs+2
- src/bin/cargo/commands/mod.rs+21-7
- src/bin/cargo/commands/run.rs+2-1
- src/bin/cargo/commands/test.rs+2-1
- src/bin/cargo/commands/verify_project.rs+2-17
- src/bin/cargo/main.rs+1-2
- src/cargo/core/compiler/build_config.rs+20
- src/cargo/core/compiler/build_plan.rs+3-1
- src/cargo/core/compiler/context/compilation_files.rs+9
- src/cargo/core/compiler/custom_build.rs+35-32
- src/cargo/core/compiler/layout.rs+12-5
- src/cargo/core/manifest.rs+5-1
- src/cargo/core/resolver/context.rs+7-9
- src/cargo/core/resolver/types.rs+30-16
- src/cargo/core/source/source_id.rs+44-35
- src/cargo/lib.rs+1
- src/cargo/ops/resolve.rs+2-2
- src/cargo/util/command_prelude.rs+9-9
- src/cargo/util/mod.rs+1
- src/cargo/util/toml/targets.rs+6-1
- src/doc/src/SUMMARY.md+1
- src/doc/src/appendix/glossary.md+178
- tests/testsuite/build_plan.rs+12-6
- tests/testsuite/build_script.rs+44-22
- tests/testsuite/cargo_alias_config.rs+25-20
- tests/testsuite/cargo_command.rs+3-6
- tests/testsuite/metabuild.rs+5
- tests/testsuite/plugins.rs+18-28
- tests/testsuite/run.rs+51
- tests/testsuite/support/mod.rs+4-2
- tests/testsuite/tool_paths.rs+3-7
- tests/testsuite/verify_project.rs+24
0 commit comments