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 10 pull requests #74929

Merged
merged 21 commits into from
Jul 30, 2020
Merged
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
821d50a
Make closures and generators a must use types
tmiasko Jul 28, 2020
4f28534
symbol mangling: use ty::print::Print for consts
lcnr Jul 28, 2020
dcce6cb
Remove links to rejected errata 4406 for RFC 4291
poliorcetics Jul 25, 2020
90d0052
Add note to clearly mark the RFC as rejected
poliorcetics Jul 26, 2020
27e1b06
Explain why inline default ToString impl
tesuji Jul 29, 2020
1b4a6a5
Link to syntax section when referencing it
tmiasko Jul 27, 2020
1fb6736
Remove deprecated unstable `{Box,Rc,Arc}::into_raw_non_null` functions
SimonSapin Jul 29, 2020
82766cb
Fix some typos in src/librustdoc/clean/auto_trait.rs
joshtriplett Jul 29, 2020
897149a
fence docs: fix example Mutex
RalfJung Jul 29, 2020
ab166cf
Fix broken link in unstable book `plugin`
giraffate Jul 29, 2020
e950927
Change the target data layout to specify more values
Lokathor Jul 29, 2020
acad0a0
Rollup merge of #74742 - poliorcetics:ip-addr-remove-rejected-errata,…
Manishearth Jul 29, 2020
3522676
Rollup merge of #74819 - tmiasko:format-spec, r=joshtriplett
Manishearth Jul 29, 2020
c07998e
Rollup merge of #74852 - lzutao:inline-rm-tostring, r=nnethercote
Manishearth Jul 29, 2020
4230f96
Rollup merge of #74869 - tmiasko:must-use-closures, r=ecstatic-morse
Manishearth Jul 29, 2020
e6b0376
Rollup merge of #74873 - lcnr:const-print, r=eddyb
Manishearth Jul 29, 2020
0f9b7bd
Rollup merge of #74902 - rust-lang:into_raw_non_null, r=dtolnay
Manishearth Jul 29, 2020
1d53340
Rollup merge of #74904 - joshtriplett:typo-fix, r=jonas-schievink
Manishearth Jul 29, 2020
2050128
Rollup merge of #74910 - RalfJung:fence, r=Mark-Simulacrum
Manishearth Jul 29, 2020
cae4d4d
Rollup merge of #74912 - giraffate:fix_broken_link_in_unstable_plugin…
Manishearth Jul 29, 2020
f4f77d7
Rollup merge of #74927 - Lokathor:Lokathor-patch-1, r=jonas-schievink
Manishearth Jul 29, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/librustdoc/clean/auto_trait.rs
Original file line number Diff line number Diff line change
@@ -430,14 +430,14 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {
}

// Converts the calculated ParamEnv and lifetime information to a clean::Generics, suitable for
// display on the docs page. Cleaning the Predicates produces sub-optimal WherePredicate's,
// display on the docs page. Cleaning the Predicates produces sub-optimal `WherePredicate`s,
// so we fix them up:
//
// * Multiple bounds for the same type are coalesced into one: e.g., 'T: Copy', 'T: Debug'
// becomes 'T: Copy + Debug'
// * Fn bounds are handled specially - instead of leaving it as 'T: Fn(), <T as Fn::Output> =
// K', we use the dedicated syntax 'T: Fn() -> K'
// * We explcitly add a '?Sized' bound if we didn't find any 'Sized' predicates for a type
// * We explicitly add a '?Sized' bound if we didn't find any 'Sized' predicates for a type
fn param_env_to_generics(
&self,
tcx: TyCtxt<'tcx>,
@@ -588,7 +588,7 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {
.args;

match args {
// Convert somethiung like '<T as Iterator::Item> = u8'
// Convert something like '<T as Iterator::Item> = u8'
// to 'T: Iterator<Item=u8>'
GenericArgs::AngleBracketed {
ref mut bindings, ..
@@ -712,7 +712,7 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {
// since FxHasher has different behavior for 32-bit and 64-bit platforms.
//
// Obviously, it's extremely undesirable for documentation rendering
// to be depndent on the platform it's run on. Apart from being confusing
// to be dependent on the platform it's run on. Apart from being confusing
// to end users, it makes writing tests much more difficult, as predicates
// can appear in any order in the final result.
//