Skip to content

Commit 883f51e

Browse files
committed
---
yaml --- r: 234916 b: refs/heads/stable c: 532235b h: refs/heads/master v: v3
1 parent 716b373 commit 883f51e

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 103238466178acdfb7f2eebe85408971cb985648
32+
refs/heads/stable: 532235be276de640d22c9d974d81f723e6094cf1
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/RELEASES.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Version 1.1.0 (June 2015)
66
Highlights
77
----------
88

9-
* The [`std::fs` module has been expanded][fs] to expand the set of
9+
* The [`std::fs` module has been expanded][fs-expand] to expand the set of
1010
functionality exposed:
1111
* `DirEntry` now supports optimizations like `file_type` and `metadata` which
1212
don't incur a syscall on some platforms.
@@ -23,11 +23,11 @@ Highlights
2323
Libraries
2424
---------
2525

26-
* The [`str::split_whitespace`] method splits a string on unicode
26+
* The `str::split_whitespace` method splits a string on unicode
2727
whitespace boundaries.
2828
* On both Windows and Unix, new extension traits provide conversion of
2929
I/O types to and from the underlying system handles. On Unix, these
30-
traits are [`FromRawFd`] and [`AsRawFd`], on Windows `FromRawHandle`
30+
traits are [`FrowRawFd`] and [`AsRawFd`], on Windows `FromRawHandle`
3131
and `AsRawHandle`. These are implemented for `File`, `TcpStream`,
3232
`TcpListener`, and `UpdSocket`. Further implementations for
3333
`std::process` will be stabilized later.
@@ -79,7 +79,8 @@ Misc
7979
* [The `drop_with_repr_extern` lint warns about mixing `repr(C)`
8080
with `Drop`][drop].
8181

82-
[`str::split_whitespace`]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.split_whitespace
82+
[`split_whitespace`]: http://doc.rust-lang.org/nightly/std/primitive.str.html#method.split_whitespace
83+
[`Iterator::cloned`]: http://doc.rust-lang.org/nightly/core/iter/trait.Iterator.html#method.cloned
8384
[`FromRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.FromRawFd.html
8485
[`AsRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.AsRawFd.html
8586
[`std::os::unix::symlink`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/fn.symlink.html
@@ -249,6 +250,7 @@ Misc
249250
[sw]: https://github.com/rust-lang/rfcs/blob/master/text/1054-str-words.md
250251
[th]: https://github.com/rust-lang/rfcs/blob/master/text/0909-move-thread-local-to-std-thread.md
251252
[send-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0458-send-improvements.md
253+
[scoped]: http://static.rust-lang.org/doc/master/std/thread/fn.scoped.html
252254
[moar-ufcs]: https://github.com/rust-lang/rust/pull/22172
253255
[prim-inherent]: https://github.com/rust-lang/rust/pull/23104
254256
[overflow]: https://github.com/rust-lang/rfcs/blob/master/text/0560-integer-overflow.md
@@ -258,10 +260,12 @@ Misc
258260
[string-pattern]: https://github.com/rust-lang/rust/pull/22466
259261
[oibit-final]: https://github.com/rust-lang/rust/pull/21689
260262
[reflect]: https://github.com/rust-lang/rust/pull/23712
263+
[debug-builder]: https://github.com/rust-lang/rfcs/blob/master/text/0640-debug-improvements.md
261264
[conversion]: https://github.com/rust-lang/rfcs/pull/529
262265
[num-traits]: https://github.com/rust-lang/rust/pull/23549
263266
[index-value]: https://github.com/rust-lang/rust/pull/23601
264267
[dropck]: https://github.com/rust-lang/rfcs/pull/769
268+
[fundamental]: https://github.com/rust-lang/rfcs/pull/1023
265269
[ci-compare]: https://gist.github.com/brson/a30a77836fbec057cbee
266270
[fn-inherit]: https://github.com/rust-lang/rust/pull/23282
267271
[fn-blanket]: https://github.com/rust-lang/rust/pull/23895
@@ -364,6 +368,7 @@ Version 1.0.0-alpha.2 (February 2015)
364368
[osstr]: https://github.com/rust-lang/rust/pull/21488
365369
[osstr-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0517-io-os-reform.md
366370
[Self]: https://github.com/rust-lang/rust/pull/22158
371+
[ufcs]: https://github.com/rust-lang/rust/pull/21077
367372
[ufcs-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0132-ufcs.md
368373
[un]: https://github.com/rust-lang/rust/pull/22256
369374

branches/stable/src/liballoc/boxed.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ impl<T : ?Sized> Box<T> {
116116
/// of `T` and releases memory. Since the way `Box` allocates and
117117
/// releases memory is unspecified, the only valid pointer to pass
118118
/// to this function is the one taken from another `Box` with
119-
/// `boxed::into_raw` function.
119+
/// `Box::into_raw` function.
120120
///
121121
/// Function is unsafe, because improper use of this function may
122122
/// lead to memory problems like double-free, for example if the
@@ -140,10 +140,8 @@ impl<T : ?Sized> Box<T> {
140140
/// # Examples
141141
/// ```
142142
/// # #![feature(box_raw)]
143-
/// use std::boxed;
144-
///
145143
/// let seventeen = Box::new(17u32);
146-
/// let raw = boxed::into_raw(seventeen);
144+
/// let raw = Box::into_raw(seventeen);
147145
/// let boxed_again = unsafe { Box::from_raw(raw) };
148146
/// ```
149147
#[unstable(feature = "box_raw", reason = "may be renamed")]

branches/stable/src/liballoc/boxed_test.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ fn deref() {
7676

7777
#[test]
7878
fn raw_sized() {
79+
let x = Box::new(17);
80+
let p = Box::into_raw(x);
7981
unsafe {
80-
let x = Box::new(17);
81-
let p = boxed::into_raw(x);
8282
assert_eq!(17, *p);
8383
*p = 19;
8484
let y = Box::from_raw(p);
@@ -105,9 +105,9 @@ fn raw_trait() {
105105
}
106106
}
107107

108+
let x: Box<Foo> = Box::new(Bar(17));
109+
let p = Box::into_raw(x);
108110
unsafe {
109-
let x: Box<Foo> = Box::new(Bar(17));
110-
let p = boxed::into_raw(x);
111111
assert_eq!(17, (*p).get());
112112
(*p).set(19);
113113
let y: Box<Foo> = Box::from_raw(p);

branches/stable/src/libcore/ptr.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@
5050
//!
5151
//! ```
5252
//! # #![feature(box_raw)]
53-
//! use std::boxed;
53+
//! let my_speed: Box<i32> = Box::new(88);
54+
//! let my_speed: *mut i32 = Box::into_raw(my_speed);
5455
//!
56+
//! // By taking ownership of the original `Box<T>` though
57+
//! // we are obligated to put it together later to be destroyed.
5558
//! unsafe {
56-
//! let my_speed: Box<i32> = Box::new(88);
57-
//! let my_speed: *mut i32 = boxed::into_raw(my_speed);
58-
//!
59-
//! // By taking ownership of the original `Box<T>` though
60-
//! // we are obligated to put it together later to be destroyed.
6159
//! drop(Box::from_raw(my_speed));
6260
//! }
6361
//! ```

0 commit comments

Comments
 (0)