about summary refs log tree commit diff
path: root/src/librustc_data_structures
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-27 14:06:39 +0000
committerbors <bors@rust-lang.org>2019-04-27 14:06:39 +0000
commitc751c7a4f47ddc3a9076d1fd45e5d3e557748280 (patch)
tree13fb0a065979b9f24a7ff84dfcefcf95c8aad128 /src/librustc_data_structures
parentd4a32d504a5aa49b951bfc70602a9615cb772acf (diff)
parentfa66b8a1540fc09928630e5d77537d5443c72af4 (diff)
downloadrust-c751c7a4f47ddc3a9076d1fd45e5d3e557748280.tar.gz
rust-c751c7a4f47ddc3a9076d1fd45e5d3e557748280.zip
Auto merge of #60329 - Centril:rollup-wv8g1ex, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #60292 (Replace the `&'tcx List<Ty<'tcx>>` in `TyKind::Tuple` with `SubstsRef<'tcx>`)
 - #60307 (Make "Implementations on Foreign Types" items in sidebar link to specific impls)
 - #60309 (Add 1.34.1 release notes)
 - #60315 (bootstrap: use correct version numbers for llvm-tools and lldb)
 - #60316 (Use "capacity" as parameter name in with_capacity() methods)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustc_data_structures')
-rw-r--r--src/librustc_data_structures/bit_set.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_data_structures/bit_set.rs b/src/librustc_data_structures/bit_set.rs
index ff7964646d6..ec7ff3bd813 100644
--- a/src/librustc_data_structures/bit_set.rs
+++ b/src/librustc_data_structures/bit_set.rs
@@ -607,8 +607,8 @@ impl<T: Idx> GrowableBitSet<T> {
         GrowableBitSet { bit_set: BitSet::new_empty(0) }
     }
 
-    pub fn with_capacity(bits: usize) -> GrowableBitSet<T> {
-        GrowableBitSet { bit_set: BitSet::new_empty(bits) }
+    pub fn with_capacity(capacity: usize) -> GrowableBitSet<T> {
+        GrowableBitSet { bit_set: BitSet::new_empty(capacity) }
     }
 
     /// Returns `true` if the set has changed.