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 12 pull requests #24798

Merged
merged 37 commits into from
Apr 25, 2015
Merged

Rollup of 12 pull requests #24798

merged 37 commits into from
Apr 25, 2015

Conversation

nikomatsakis and others added 30 commits April 18, 2015 11:35
table, introduce a `FreeRegionMap` data structure. regionck computes the
`FreeRegionMap` for each fn and stores the result into the tcx so that
borrowck can use it (this could perhaps be refactored to have borrowck
recompute the map, but it's a bid tedious to recompute due to the
interaction of closures and free fns). The main reason to do this is
because of rust-lang#22779 -- using a global table was incorrect because when
validating impl method signatures, we want to use the free region
relationships from the *trait*, not the impl.

Fixes rust-lang#22779.
As part of the audit for rust-lang#22820 the following feature gate tests have
been added:

* `negate_unsigned`
* `on_unimplemented`
* `optin_builtin_traits`
* `plugin`
* `rustc_attrs`
* `slice_patterns`
As part of the audit for rust-lang#22820 the following feature gate tests have
been added:

* `rustc_diagnostic_macros`

/cc rust-lang#19624
As part of the audit for rust-lang#22820 the following duplicate feature
gate tests were removed:

* `box_patterns`
* `simd_ffi`

These tests for `box_patterns` and `simd_ffi` were added in rust-lang#23578,
however there were existing tests in rust-lang#20723 and rust-lang#21233 respectively.
Changed in rust-lang#22838.

audited (raw) byte string literals @ rust-lang#16676
`is` and `us` suffixes are deprecated in favor of `isize` and `usize`.
- Remove mention of unit type
- Update closure types and reference types sections
- Fix minor typos
Audit & Edit Chapter 8.1 Types in reference manual

- Remove mention of unit type
- Update closure types and reference types sections
- Fix minor typos
* `for` loops now use `IntoIterator` instead of just `Iterator`
* Simplify the example by removing unnecessary `Vec::iter` call.
…ned-impl, r=pnkfelix

Rather than storing the relations between free-regions in a global
table, introduce a `FreeRegionMap` data structure. regionck computes the
`FreeRegionMap` for each fn and stores the result into the tcx so that
borrowck can use it (this could perhaps be refactored to have borrowck
recompute the map, but it's a bid tedious to recompute due to the
interaction of closures and free fns). The main reason to do this is
because of rust-lang#22779 -- using a global table was incorrect because when
validating impl method signatures, we want to use the free region
relationships from the *trait*, not the impl.

Fixes rust-lang#22779.
I forgot these heavily use associated types, so move it after that
as well.
Fixes rust-lang#24656 

r? @pnkfelix 

I just added the examples, but if the wording needs expanded too, let me know what you think should be added :)
…loading, r=alexcrichton

I forgot these heavily use associated types, so move it after that
as well.
…labnik

From rust-lang#24723 (comment) :

> Yes, I've been meaning to just remove it in favor of GRAMMAR.md
> - steveklabnik
…crichton

Okay, last chapter other than ownership stuff. 🎊
As part of the audit for rust-lang#22820 the following feature gate tests have been
added:

* `negate_unsigned`
* `on_unimplemented`
* `optin_builtin_traits`
* `plugin`
* `rustc_attrs`
* `rustc_diagnostic_macros`
* `slice_patterns`

In addition some feature gate error message typos fixed.
As part of the audit for rust-lang#22820 the following duplicate feature
gate tests were removed:

* `box_patterns`
* `simd_ffi`

These tests for `box_patterns` and `simd_ffi` were added in rust-lang#23578,
however there were existing tests in rust-lang#20723 and rust-lang#21233 respectively.

r? @nrc
`is` and `us` suffixes are deprecated in favor of `isize` and `usize`.
Update 7.2.20 (`for` expressions):

* `for` loops now use `IntoIterator` instead of just `Iterator`
* Simplify the example by removing unnecessary `Vec::iter` call.

...and a fix for a minor formatting error.

r? @steveklabnik
@rust-highfive
Copy link
Collaborator

r? @pcwalton

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

@steveklabnik
Copy link
Member Author

@bors: r+ p=100

@bors
Copy link
Contributor

bors commented Apr 25, 2015

📌 Commit 23b1d17 has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented Apr 25, 2015

⌛ Testing commit 23b1d17 with merge a40261a...

bors added a commit that referenced this pull request Apr 25, 2015
@bors bors merged commit 23b1d17 into rust-lang:master Apr 25, 2015
@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.