Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit bdfd698

Browse files
committedAug 16, 2019
Auto merge of #63640 - Centril:rollup-yeb8o66, r=Centril
Rollup of 10 pull requests Successful merges: - #60492 (Add custom nth_back for Chain) - #61780 (Finalize the error type for `try_reserve`) - #63495 ( Remove redundant `ty` fields from `mir::Constant` and `hair::pattern::PatternRange`.) - #63525 (Make sure that all file loading happens via SourceMap) - #63595 (add sparc64-unknown-openbsd target) - #63604 (Some update for vxWorks) - #63613 (Hygienize use of built-in macros in the standard library) - #63632 (A couple of comment fixes.) - #63634 (ci: properly set the job name in CPU stats) - #63636 (ci: move linkcheck from mingw-2 to mingw-1) Failed merges: r? @ghost
2 parents 9a32ad0 + 6b0a838 commit bdfd698

File tree

94 files changed

+377
-549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+377
-549
lines changed
 

‎Cargo.lock

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,19 +1138,12 @@ dependencies = [
11381138

11391139
[[package]]
11401140
name = "hashbrown"
1141-
version = "0.4.0"
1141+
version = "0.5.0"
11421142
source = "registry+https://github.com/rust-lang/crates.io-index"
11431143
dependencies = [
11441144
"compiler_builtins 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
11451145
"rustc-std-workspace-alloc 1.0.0",
11461146
"rustc-std-workspace-core 1.0.0",
1147-
]
1148-
1149-
[[package]]
1150-
name = "hashbrown"
1151-
version = "0.5.0"
1152-
source = "registry+https://github.com/rust-lang/crates.io-index"
1153-
dependencies = [
11541147
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
11551148
]
11561149

@@ -3534,7 +3527,7 @@ dependencies = [
35343527
"core 0.0.0",
35353528
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
35363529
"fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
3537-
"hashbrown 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
3530+
"hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
35383531
"libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
35393532
"panic_abort 0.0.0",
35403533
"panic_unwind 0.0.0",
@@ -4450,7 +4443,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
44504443
"checksum globset 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef4feaabe24a0a658fd9cf4a9acf6ed284f045c77df0f49020ba3245cfb7b454"
44514444
"checksum h2 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "a539b63339fbbb00e081e84b6e11bd1d9634a82d91da2984a18ac74a8823f392"
44524445
"checksum handlebars 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "df044dd42cdb7e32f28557b661406fc0f2494be75199779998810dbc35030e0d"
4453-
"checksum hashbrown 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9529213c67695ca2d146e6f263b7b72df8fa973368beadf767e8ed80c03f2f36"
44544446
"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353"
44554447
"checksum heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea04fa3ead4e05e51a7c806fc07271fdbde4e246a6c6d1efd52e72230b771b82"
44564448
"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"

‎src/bootstrap/cc_detect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fn cc2ar(cc: &Path, target: &str) -> Option<PathBuf> {
4646
} else if target.contains("openbsd") {
4747
Some(PathBuf::from("ar"))
4848
} else if target.contains("vxworks") {
49-
Some(PathBuf::from("vx-ar"))
49+
Some(PathBuf::from("wr-ar"))
5050
} else {
5151
let parent = cc.parent().unwrap();
5252
let file = cc.file_name().unwrap().to_str().unwrap();

0 commit comments

Comments
 (0)
Please sign in to comment.