Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 14 pull requests #56437

Closed
wants to merge 36 commits into from
Closed
Changes from 2 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
c343bbd
update miri
RalfJung Nov 28, 2018
682f0f8
Consider references and unions potentially inhabited during privacy-r…
varkor Nov 20, 2018
d2b3407
Add a test for uninhabitedness changes
varkor Nov 20, 2018
32a8dec
Clarify undecided semantics
varkor Nov 20, 2018
46ef9f8
Fix broken tests
varkor Nov 20, 2018
1cdf5df
Fix error message after rebase
varkor Nov 29, 2018
113ae0f
update miri
RalfJung Nov 30, 2018
1560a75
Refer to the second borrow as the "second borrow".
wildarch Nov 30, 2018
aa5a4ef
Removed feature gate.
alexreg Nov 30, 2018
7bc1255
Removed chapter from Unstable Book.
alexreg Nov 30, 2018
d609fdf
Updated ui tests.
alexreg Nov 30, 2018
f107514
Deal with EINTR in net timeout tests
cuviper Nov 30, 2018
f4cde5b
stabilize std::dbg!(...)
Centril Dec 1, 2018
4c2c523
Move VecDeque::resize_with out of the impl<T:Clone> block
scottmcm Dec 1, 2018
a3b7a21
Improve the unstable book example for `#[marker]`
scottmcm Dec 1, 2018
df0ab06
Update tracking issue for `extern_crate_self`
petrochenkov Dec 1, 2018
08a6cf3
Remove unneeded body class selector
GuillaumeGomez Dec 1, 2018
12c9b79
Fix failing tidy (line endings on Windows)
petrochenkov Dec 1, 2018
e7e9692
remove some uses of try!
mark-i-m Dec 1, 2018
074f975
Explain raw identifer syntax
mark-i-m Dec 2, 2018
1fca907
link to raw identifiers
mark-i-m Dec 2, 2018
1e18cc9
Update issue number of `shrink_to` methods to point the tracking issue
ordovicia Dec 2, 2018
63b7bf8
Rollup merge of #56110 - varkor:inhabitedness-union-enum, r=cramertj
Centril Dec 2, 2018
07504b2
Rollup merge of #56305 - RalfJung:miri, r=oli-obk
Centril Dec 2, 2018
1e8c93c
Rollup merge of #56366 - alexreg:stabilise-self_in_typedefs, r=Centril
Centril Dec 2, 2018
05aedcb
Rollup merge of #56372 - wildarch:issue-55314-second-borrow-ref, r=da…
Centril Dec 2, 2018
4e94bec
Rollup merge of #56394 - cuviper:interrupted-timeout, r=sfackler
Centril Dec 2, 2018
aa92cc9
Rollup merge of #56395 - Centril:stabilize-dbg-macro, r=SimonSapin
Centril Dec 2, 2018
f352eec
Rollup merge of #56401 - scottmcm:vecdeque-resize-with, r=dtolnay
Centril Dec 2, 2018
101e116
Rollup merge of #56402 - scottmcm:better-marker-trait-example, r=Centril
Centril Dec 2, 2018
3993dc9
Rollup merge of #56412 - petrochenkov:extself, r=Centril
Centril Dec 2, 2018
298e681
Rollup merge of #56416 - GuillaumeGomez:css-body, r=QuietMisdreavus
Centril Dec 2, 2018
6311bde
Rollup merge of #56418 - petrochenkov:wintidy, r=nagisa
Centril Dec 2, 2018
705da41
Rollup merge of #56419 - mark-i-m:remove-try, r=Centril
Centril Dec 2, 2018
e292b3c
Rollup merge of #56424 - mark-i-m:explain-raw, r=Centril
Centril Dec 2, 2018
c03c34c
Rollup merge of #56432 - ordovicia:shrink-to-issue, r=Centril
Centril Dec 2, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/liballoc/collections/binary_heap.rs
Original file line number Diff line number Diff line change
@@ -529,7 +529,7 @@ impl<T: Ord> BinaryHeap<T> {
/// assert!(heap.capacity() >= 10);
/// ```
#[inline]
#[unstable(feature = "shrink_to", reason = "new API", issue="0")]
#[unstable(feature = "shrink_to", reason = "new API", issue="56431")]
pub fn shrink_to(&mut self, min_capacity: usize) {
self.data.shrink_to(min_capacity)
}
2 changes: 1 addition & 1 deletion src/liballoc/collections/vec_deque.rs
Original file line number Diff line number Diff line change
@@ -701,7 +701,7 @@ impl<T> VecDeque<T> {
/// buf.shrink_to(0);
/// assert!(buf.capacity() >= 4);
/// ```
#[unstable(feature = "shrink_to", reason = "new API", issue="0")]
#[unstable(feature = "shrink_to", reason = "new API", issue="56431")]
pub fn shrink_to(&mut self, min_capacity: usize) {
assert!(self.capacity() >= min_capacity, "Tried to shrink to a larger capacity");

2 changes: 1 addition & 1 deletion src/liballoc/string.rs
Original file line number Diff line number Diff line change
@@ -1050,7 +1050,7 @@ impl String {
/// assert!(s.capacity() >= 3);
/// ```
#[inline]
#[unstable(feature = "shrink_to", reason = "new API", issue="0")]
#[unstable(feature = "shrink_to", reason = "new API", issue="56431")]
pub fn shrink_to(&mut self, min_capacity: usize) {
self.vec.shrink_to(min_capacity)
}
2 changes: 1 addition & 1 deletion src/liballoc/vec.rs
Original file line number Diff line number Diff line change
@@ -613,7 +613,7 @@ impl<T> Vec<T> {
/// vec.shrink_to(0);
/// assert!(vec.capacity() >= 3);
/// ```
#[unstable(feature = "shrink_to", reason = "new API", issue="0")]
#[unstable(feature = "shrink_to", reason = "new API", issue="56431")]
pub fn shrink_to(&mut self, min_capacity: usize) {
self.buf.shrink_to_fit(cmp::max(self.len, min_capacity));
}
2 changes: 1 addition & 1 deletion src/libstd/collections/hash/map.rs
Original file line number Diff line number Diff line change
@@ -1018,7 +1018,7 @@ impl<K, V, S> HashMap<K, V, S>
/// map.shrink_to(0);
/// assert!(map.capacity() >= 2);
/// ```
#[unstable(feature = "shrink_to", reason = "new API", issue="0")]
#[unstable(feature = "shrink_to", reason = "new API", issue="56431")]
pub fn shrink_to(&mut self, min_capacity: usize) {
assert!(self.capacity() >= min_capacity, "Tried to shrink to a larger capacity");

2 changes: 1 addition & 1 deletion src/libstd/collections/hash/set.rs
Original file line number Diff line number Diff line change
@@ -315,7 +315,7 @@ impl<T, S> HashSet<T, S>
/// assert!(set.capacity() >= 2);
/// ```
#[inline]
#[unstable(feature = "shrink_to", reason = "new API", issue="0")]
#[unstable(feature = "shrink_to", reason = "new API", issue="56431")]
pub fn shrink_to(&mut self, min_capacity: usize) {
self.map.shrink_to(min_capacity)
}
2 changes: 1 addition & 1 deletion src/libstd/ffi/os_str.rs
Original file line number Diff line number Diff line change
@@ -324,7 +324,7 @@ impl OsString {
/// assert!(s.capacity() >= 3);
/// ```
#[inline]
#[unstable(feature = "shrink_to", reason = "new API", issue="0")]
#[unstable(feature = "shrink_to", reason = "new API", issue="56431")]
pub fn shrink_to(&mut self, min_capacity: usize) {
self.inner.shrink_to(min_capacity)
}