Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0f9c784

Browse files
committedJan 17, 2018
Auto merge of #47522 - kennytm:rollup, r=kennytm
Rollup of 21 pull requests - Successful merges: #47302, #47333, #47387, #47404, #47407, #47426, #47427, #47436, #47444, #47456, #47458, #47467, #47479, #47481, #47483, #47487, #47497, #47498, #47505, #47509, #47514 - Failed merges:
2 parents 3e49ada + 5fade39 commit 0f9c784

File tree

85 files changed

+611
-281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+611
-281
lines changed
 

‎RELEASES.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ Compatibility Notes
577577
a warning.
578578
- [From the pound escape, lines consisting of multiple `#`s are
579579
now visible][41785]
580-
- [It is an error to reexport private enum variants][42460]. This is
580+
- [It is an error to re-export private enum variants][42460]. This is
581581
known to break a number of crates that depend on an older version of
582582
mustache.
583583
- [On Windows, if `VCINSTALLDIR` is set incorrectly, `rustc` will try
@@ -2251,10 +2251,10 @@ Rustdoc
22512251
-------
22522252

22532253
* [Fix empty implementation section on some module pages](https://github.com/rust-lang/rust/pull/34536)
2254-
* [Fix inlined renamed reexports in import lists](https://github.com/rust-lang/rust/pull/34479)
2254+
* [Fix inlined renamed re-exports in import lists](https://github.com/rust-lang/rust/pull/34479)
22552255
* [Fix search result layout for enum variants and struct fields](https://github.com/rust-lang/rust/pull/34477)
22562256
* [Fix issues with source links to external crates](https://github.com/rust-lang/rust/pull/34387)
2257-
* [Fix redirect pages for renamed reexports](https://github.com/rust-lang/rust/pull/34245)
2257+
* [Fix redirect pages for renamed re-exports](https://github.com/rust-lang/rust/pull/34245)
22582258

22592259
Tooling
22602260
-------
@@ -4988,7 +4988,7 @@ Version 0.10 (2014-04-03)
49884988
* std: The `vec` module has been renamed to `slice`.
49894989
* std: A new vector type, `Vec<T>`, has been added in preparation for DST.
49904990
This will become the only growable vector in the future.
4991-
* std: `std::io` now has more public-reexports. Types such as `BufferedReader`
4991+
* std: `std::io` now has more public re-exports. Types such as `BufferedReader`
49924992
are now found at `std::io::BufferedReader` instead of
49934993
`std::io::buffered::BufferedReader`.
49944994
* std: `print` and `println` are no longer in the prelude, the `print!` and
@@ -5079,8 +5079,8 @@ Version 0.10 (2014-04-03)
50795079
* render standalone markdown files.
50805080
* the --test flag tests all code blocks by default.
50815081
* exported macros are displayed.
5082-
* reexported types have their documentation inlined at the location of the
5083-
first reexport.
5082+
* re-exported types have their documentation inlined at the location of the
5083+
first re-export.
50845084
* search works across crates that have been rendered to the same output
50855085
directory.
50865086

@@ -5467,7 +5467,7 @@ Version 0.7 (2013-07-03)
54675467
incl. `any`, `all`. removed.
54685468
* std: The `finalize` method of `Drop` renamed to `drop`.
54695469
* std: The `drop` method now takes `&mut self` instead of `&self`.
5470-
* std: The prelude no longer reexports any modules, only types and traits.
5470+
* std: The prelude no longer re-exports any modules, only types and traits.
54715471
* std: Prelude additions: `print`, `println`, `FromStr`, `ApproxEq`, `Equiv`,
54725472
`Iterator`, `IteratorUtil`, many numeric traits, many tuple traits.
54735473
* std: New numeric traits: `Fractional`, `Real`, `RealExt`, `Integer`, `Ratio`,

‎src/Cargo.lock

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.