Skip to content

Commit

Permalink
Update Cargo submodule
Browse files Browse the repository at this point in the history 
Also update Cargo's dependencies while we're at it
  • Loading branch information
@alexcrichton
alexcrichton committed Aug 25, 2018
1 parent 39e6ba8 commit 2863b75
Show file tree
Hide file tree
Showing 6 changed files with 442 additions and 416 deletions.
822 changes: 421 additions & 401 deletions src/Cargo.lock
View file

Large diffs are not rendered by default.

0 ...est/run-pass/issue-52705/auxiliary/png.rs → ...st/run-pass/issue-52705/auxiliary/png2.rs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions src/test/run-pass/issue-52705/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// aux-build:png.rs
// aux-build:png2.rs
// edition:2018

mod png {
use png as png_ext;
use png2 as png_ext;

fn foo() -> png_ext::DecodingError { unimplemented!() }
}
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 61 files
+2 −2 .travis.yml
+3 −2 Cargo.toml
+6 −2 appveyor.yml
+3 −2 src/cargo/lib.rs
+7 −46 src/cargo/ops/cargo_doc.rs
+108 −23 src/cargo/ops/cargo_package.rs
+1 −1 src/cargo/util/diagnostic_server.rs
+7 −1 src/cargo/util/toml/mod.rs
+19 −47 tests/testsuite/alt_registry.rs
+17 −19 tests/testsuite/bad_config.rs
+4 −12 tests/testsuite/bad_manifest_path.rs
+18 −26 tests/testsuite/bench.rs
+105 −141 tests/testsuite/build.rs
+3 −3 tests/testsuite/build_auth.rs
+2 −2 tests/testsuite/build_lib.rs
+6 −12 tests/testsuite/build_plan.rs
+72 −76 tests/testsuite/build_script.rs
+4 −4 tests/testsuite/cargo_alias_config.rs
+5 −7 tests/testsuite/cargo_features.rs
+3 −3 tests/testsuite/cfg.rs
+17 −25 tests/testsuite/check.rs
+11 −11 tests/testsuite/clean.rs
+3 −5 tests/testsuite/concurrent.rs
+4 −4 tests/testsuite/corrupt_git.rs
+22 −24 tests/testsuite/cross_compile.rs
+2 −3 tests/testsuite/cross_publish.rs
+3 −15 tests/testsuite/custom_target.rs
+3 −3 tests/testsuite/dep_info.rs
+22 −29 tests/testsuite/doc.rs
+18 −22 tests/testsuite/features.rs
+2 −2 tests/testsuite/fetch.rs
+13 −13 tests/testsuite/freshness.rs
+2 −3 tests/testsuite/generate_lockfile.rs
+23 −33 tests/testsuite/git.rs
+1 −1 tests/testsuite/local_registry.rs
+2 −2 tests/testsuite/lockfile_compat.rs
+14 −32 tests/testsuite/metadata.rs
+2 −2 tests/testsuite/net_config.rs
+5 −8 tests/testsuite/overrides.rs
+115 −28 tests/testsuite/package.rs
+7 −8 tests/testsuite/path.rs
+4 −4 tests/testsuite/plugins.rs
+7 −7 tests/testsuite/profiles.rs
+20 −51 tests/testsuite/publish.rs
+4 −10 tests/testsuite/read_manifest.rs
+4 −11 tests/testsuite/registry.rs
+1 −1 tests/testsuite/rename_deps.rs
+57 −102 tests/testsuite/required_features.rs
+2 −3 tests/testsuite/resolve.rs
+25 −41 tests/testsuite/run.rs
+8 −25 tests/testsuite/rustc.rs
+5 −10 tests/testsuite/rustdoc.rs
+4 −6 tests/testsuite/rustdocflags.rs
+64 −79 tests/testsuite/rustflags.rs
+1 −2 tests/testsuite/support/cross_compile.rs
+4 −0 tests/testsuite/support/git.rs
+55 −88 tests/testsuite/test.rs
+8 −29 tests/testsuite/tool_paths.rs
+3 −7 tests/testsuite/update.rs
+2 −5 tests/testsuite/verify_project.rs
+7 −11 tests/testsuite/workspaces.rs
24 changes: 13 additions & 11 deletions src/tools/rustc-workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,25 @@ syn = { version = "0.14", features = ['extra-traits'] }
[target.'cfg(windows)'.dependencies.winapi]
version = "0.3"
features = [
"profileapi",
"basetsd",
"jobapi",
"jobapi2",
"lmcons",
"memoryapi",
"minschannel",
"securitybaseapi",
"jobapi2",
"schannel",
"sysinfoapi",
"jobapi",
"synchapi",
"wincrypt",
"winbase",
"minwinbase",
"ntsecapi",
"basetsd",
"ntstatus",
"profileapi",
"psapi",
"schannel",
"securitybaseapi",
"shellapi",
"synchapi",
"sysinfoapi",
"timezoneapi",
"lmcons",
"userenv",
"winbase",
"wincon",
"wincrypt",
]
6 changes: 5 additions & 1 deletion src/tools/tidy/src/deps.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ static EXCEPTIONS: &'static [&'static str] = &[
"colored", // MPL-2.0, rustfmt
"ordslice", // Apache-2.0, rls
"cloudabi", // BSD-2-Clause, (rls -> crossbeam-channel 0.2 -> rand 0.5)
"ryu", // Apache-2.0, rls/cargo/... (b/c of serde)
];

/// Which crates to check against the whitelist?
Expand All @@ -68,9 +69,10 @@ static WHITELIST: &'static [Crate] = &[
Crate("bitflags"),
Crate("byteorder"),
Crate("cc"),
Crate("cfg-if"),
Crate("chalk-engine"),
Crate("chalk-macros"),
Crate("cfg-if"),
Crate("cloudabi"),
Crate("cmake"),
Crate("crossbeam-deque"),
Crate("crossbeam-epoch"),
Expand Down Expand Up @@ -103,6 +105,7 @@ static WHITELIST: &'static [Crate] = &[
Crate("pkg-config"),
Crate("quick-error"),
Crate("rand"),
Crate("rand_core"),
Crate("redox_syscall"),
Crate("redox_termios"),
Crate("regex"),
Expand All @@ -125,6 +128,7 @@ static WHITELIST: &'static [Crate] = &[
Crate("unicode-width"),
Crate("unreachable"),
Crate("utf8-ranges"),
Crate("version_check"),
Crate("void"),
Crate("winapi"),
Crate("winapi-build"),
Expand Down

0 comments on commit 2863b75

Please sign in to comment.