diff options
| author | bors <bors@rust-lang.org> | 2015-08-10 12:01:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-10 12:01:01 +0000 |
| commit | a136d4c95f2d927f327713d432421c47ee90df77 (patch) | |
| tree | 395a3bed592eb4053be7fa99a0e70db9943e582f /src/libstd | |
| parent | febdc3b201bcce1546c88e3be1b956d3f90d3059 (diff) | |
| parent | 03f561c5f2084031443ec795f87a66ed6be5282a (diff) | |
| download | rust-a136d4c95f2d927f327713d432421c47ee90df77.tar.gz rust-a136d4c95f2d927f327713d432421c47ee90df77.zip | |
Auto merge of #27634 - TimNN:master, r=dotdash
I don't know how this single inline caused the breakage but it seems to be the cause of the issue (see https://github.com/rust-lang/rust/issues/27619#issuecomment-129420094).
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/table.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs index e8ac8a13296..349462aebe3 100644 --- a/src/libstd/collections/hash/table.rs +++ b/src/libstd/collections/hash/table.rs @@ -511,7 +511,6 @@ impl<K, V, M: Deref<Target=RawTable<K, V>>> GapThenFull<K, V, M> { /// # Panics /// /// Panics if `target_alignment` is not a power of two. -#[inline] fn round_up_to_next(unrounded: usize, target_alignment: usize) -> usize { assert!(target_alignment.is_power_of_two()); (unrounded + target_alignment - 1) & !(target_alignment - 1) |