Skip to content

Rolling up PRs in the queue - #20360

Merged
bors merged 58 commits into
rust-lang:masterfrom
alexcrichton:rollup
Dec 31, 2014
Merged

Rolling up PRs in the queue#20360
bors merged 58 commits into
rust-lang:masterfrom
alexcrichton:rollup

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

No description provided.

murarthand others added 30 commits December 28, 2014 15:45
In f436f9c, the Send and Sync traits became `unsafe`. They were updated for `target_arch = x86` and others, but `mips` was missed.
Closesrust-lang#19949 and rust-lang/rfcs#428
[breaking change]
If you have traits used with objects with static methods, you'll need to move
the static methods to a different trait.
In the context of explaining the declaration of mutable bindings, using 'intended' probably conveys the meaning better than 'cared'.
This commit takes a second pass through the `vec` module to
stabilize its API. The changes are as follows:
**Stable**:
* `dedup`
* `from_raw_parts`
* `insert`
* `into_iter`
* `is_empty`
* `remove`
* `reserve_exact`
* `reserve`
* `retain`
* `swap_remove`
* `truncate`
**Deprecated**:
* `from_fn`, `from_elem`, `grow_fn` and `grow`, all deprecated in
favor of iterators. See rust-lang/rfcs#509
* `partition`, `partitioned`, deprecated in favor of a new, more
general iterator consumer called `partition`.
* `unzip`, deprecated in favor of a new, more general iterator
consumer called `unzip`.
A few remaining methods are left at experimental status.
[breaking-change]
This commit takes a second pass through the `slice` module to
stabilize its API. The changes are as follows:
**Stable**:
* `as_mut_slice`
* `as_ptr`, `as_mut_ptr`
* `binary_search_by` (was: `binary_search`)
* `binary_search` (was: `binary_search_elem`)
* `chunks`, `chunks_mut`
* `contains`
* `ends_with`
* `first`, `first_mut` (was: `head`)
* `get_unchecked`, `get_unchecked_mut` (was: `unsafe_get`)
* `get`
* `is_empty`
* `iter`, `iter_mut`
* `len`
* `reverse`
* `sort_by`
* `sort`
* `split_at`, `split_at_mut`
* `split_mut`, `splitn_mut`, `rsplitn_mut`
* `split`, `splitn`, `rsplitn`
* `starts_with`
* `swap`
* `to_vec`
* `windows`
**Deprecated**:
* `head`, `head_mut` (renamed as above)
* `unsafe_get`, `unsafe_mut` (renamed as above)
* `binary_search_elem` (renamed as above)
* `partitioned`, deprecated in favor of a new, more
general iterator consumer called `partition`.
* `BinarySearchResult`, deprecated in favor of `Result<uint, uint>`
[breaking-change]
We've long had traits `StrVector` and `VectorVector` providing
`concat`/`connect` and `concat_vec`/`connect_vec` respectively. The
reason for the distinction is that coherence rules did not used to be
robust enough to allow impls on e.g. `Vec<String>` versus `Vec<&[T]>`.
This commit consolidates the traits into a single `SliceConcatExt` trait
provided by `slice` and the preldue (where it replaces `StrVector`,
which is removed.)
[breaking-change]
alexcrichtonand others added 4 commits December 30, 2014 16:26
Patch for rust-lang#20340. `rustdoc --version` panics because it uses `rustc_driver::version`, which in turn checks the `verbose` flag, which was not defined for rustdoc. In this patch I have added a verbose flag to rustdoc, because I think it should be useful for other things besides --version.
Another possible fix would be to check if a verbose option was defined in `rustc_driver` or add an extra `version` function for rustdoc.
Conflicts:
src/libcollections/slice.rs
src/libcollections/vec.rs
src/libstd/sys/windows/os.rs
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@bors
bors merged commit 139f44b into rust-lang:masterDec 31, 2014
@alexcrichton
alexcrichton deleted the rollup branch December 31, 2014 23:13
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

18 participants

@alexcrichton@rust-highfive@aturon@nrc@daboross@bors@brson@murarth@steveklabnik@seanmonstar@epall@luqmana@huonw@vhbit@fhahn@js-ojus@michaelwoerister@frewsxcv