about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-10-25 00:40:55 +0000
committerbors <bors@rust-lang.org>2019-10-25 00:40:55 +0000
commitd54111afc061ef398cd8ce28984f9e8d70001b24 (patch)
tree4e68a43ce1cde8526dd1ce1229ed297a8182a1b4 /src/libstd
parent10a52c25cad963986cace7a22c167363afca0d74 (diff)
parentfd6795b46a249d33c0127f77e08019b401a67fc5 (diff)
downloadrust-d54111afc061ef398cd8ce28984f9e8d70001b24.tar.gz
rust-d54111afc061ef398cd8ce28984f9e8d70001b24.zip
Auto merge of #65771 - Centril:rollup-upfsvrb, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #65625 (Turn crate store into a resolver output)
 - #65627 (Forbid non-`structural_match` types in const generics)
 - #65710 (Update cargo)
 - #65729 (Update test cases for vxWorks)
 - #65746 (Tweak format string error to point at arguments always)
 - #65753 (Don't assert for different instance on impl trait alias)
 - #65755 (Avoid ICE when adjusting bad self ty)
 - #65766 (Update hashbrown to 0.6.2)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/Cargo.toml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 5309af6f4c3..efe5c9d28f0 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -23,7 +23,7 @@ libc = { version = "0.2.51", default-features = false, features = ['rustc-dep-of
 compiler_builtins = { version = "0.1.16" }
 profiler_builtins = { path = "../libprofiler_builtins", optional = true }
 unwind = { path = "../libunwind" }
-hashbrown = { version = "0.6.1", default-features = false, features = ['rustc-dep-of-std'] }
+hashbrown = { version = "0.6.2", default-features = false, features = ['rustc-dep-of-std'] }
 
 [dependencies.backtrace_rs]
 package = "backtrace"