Skip to content

Rollup #19785

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

Merged
merged 38 commits into from
Dec 15, 2014
Merged

Rollup #19785

merged 38 commits into from
Dec 15, 2014

Conversation

brson
Copy link
Contributor

@brson brson commented Dec 12, 2014

No description provided.

@brson
Copy link
Contributor Author

brson commented Dec 12, 2014

Running this through try first.

@brson
Copy link
Contributor Author

brson commented Dec 13, 2014

Running through try again.

lilyball and others added 3 commits December 12, 2014 21:26
In preparation for removing the std::cmp::Ordering reexport, this needs
to be done to prevent errors like:

```
note: in expansion of #[deriving]
note: expansion site
error: unresolved name `std::cmp::Equal`
\#[deriving(Clone, PartialEq, PartialOrd, Eq, Ord, Show)]
                                              ^~~
```
@sfackler
Copy link
Member

Needs a rebase

@brson
Copy link
Contributor Author

brson commented Dec 14, 2014

I guess I'll just close this and let bors do it.

@brson brson closed this Dec 14, 2014
@brson brson reopened this Dec 14, 2014
brson added 19 commits December 15, 2014 06:44
This line was declared twice, which causes the build of i10n docs to
fail.
These should be properly annotated instead.

Fixes rust-lang#16219.
This is a revival of rust-lang#19517 (per request of @alexcrichton) now that the new snapshots have landed.  We can now remove the last feature gates for if_let, while_let, and tuple_indexing scattered throughout the test sources since these features have been added to Rust.

Closes rust-lang#19473.
Build `clean::ConstantItem` values in the `inline` module and
pretty-print the AST for inlined const items.

Doc strings are still missing from inlined constants (see rust-lang#19773).

Partially address rust-lang#18156, rust-lang#19722, rust-lang#19185

Fix rust-lang#15821

r? @alexcrichton
The old PartialOrd impl for raw pointers would always return Some(_), so It might as well implement Ord too.
Vim still incorrectly highlights just `ExactSize` as a valid trait name, but the trait has been renamed to `ExactSizeIterator`.
On AArch64, libc::c_char is u8. There are some places in the code where i8 is assumed, which causes compilation errors.

(AArch64 is not officially supported yet, but this change does not hurt any other targets and makes the code future-proof.)
Fix rust-lang#19773

Together with rust-lang#19774 (which this is rebased on):

Fix rust-lang#18156, fix rust-lang#19722, fix rust-lang#19185

r? @alexcrichton (since this was your suggestion!)
In preparation for [removing the `std::cmp::Ordering` reexport](rust-lang#19253), this needs to be done to prevent errors like:

```
note: in expansion of #[deriving]
note: expansion site
error: unresolved name `std::cmp::Equal`
#[deriving(Clone, PartialEq, PartialOrd, Eq, Ord, Show)]
                                             ^~~
```
bors added a commit that referenced this pull request Dec 15, 2014
@bors bors merged commit 1cb7e9f into rust-lang:master Dec 15, 2014
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.