Skip to content

Rollup of 7 pull requests #42336

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 20 commits into from
May 31, 2017
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7748bc6
Include context info into closure_kinds
tommyip May 24, 2017
bf25b5e
Explain why a closure is `FnOnce` in closure errors
tommyip May 24, 2017
b559507
Clarify the docs for align_of and its variants
May 26, 2017
54bbe23
Clarify docs on implementing Into.
May 20, 2017
9873acc
Remove --crate-type=metadata deprecation warning
citizen428 May 28, 2017
ee88a87
Explain why closure is moved in error message
tommyip May 28, 2017
31bfdd7
Update fn_once-moved test
tommyip May 30, 2017
265dce6
RangeFrom should have an infinite size_hint
scottmcm May 30, 2017
c25e271
Add 'the'
May 30, 2017
c2f7e94
Update closure errors to use `span_note`
tommyip May 30, 2017
69f8225
fix links to "module-level documentation"
rap2hpoutre May 31, 2017
54edfee
Parse macros named "default" correctly.
qnighy May 31, 2017
b670930
Emit proper expectation for the "default" keyword.
qnighy May 31, 2017
d5a7fd5
Rollup merge of #42126 - clarcharr:into_docs, r=steveklabnik
Mark-Simulacrum May 31, 2017
b851d1c
Rollup merge of #42196 - tommyip:explain_closure_err, r=nikomatsakis
Mark-Simulacrum May 31, 2017
c0df1d4
Rollup merge of #42252 - stjepang:clarify-alignof-docs, r=nikomatsakis
Mark-Simulacrum May 31, 2017
0daa27f
Rollup merge of #42277 - citizen428:remove-crate-type-metadata, r=nik…
Mark-Simulacrum May 31, 2017
b62eb7f
Rollup merge of #42315 - scottmcm:rangefrom-sizehint, r=alexcrichton
Mark-Simulacrum May 31, 2017
0c339ff
Rollup merge of #42329 - rap2hpoutre:patch-6, r=steveklabnik
Mark-Simulacrum May 31, 2017
7f286a8
Rollup merge of #42330 - qnighy:macro-named-default, r=petrochenkov
Mark-Simulacrum May 31, 2017
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
Prev Previous commit
Next Next commit
Add 'the'
  • Loading branch information
Stjepan Glavina committed May 30, 2017
commit c25e271858d3aa131814a6c60669783d20b5e89e
8 changes: 4 additions & 4 deletions src/libcore/mem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ pub fn size_of_val<T: ?Sized>(val: &T) -> usize {

/// Returns the [ABI]-required minimum alignment of a type.
///
/// Every reference to a value of type `T` must be a multiple of this number.
/// Every reference to a value of the type `T` must be a multiple of this number.
///
/// This is the alignment used for struct fields. It may be smaller than the preferred alignment.
///
Expand All @@ -243,7 +243,7 @@ pub fn min_align_of<T>() -> usize {

/// Returns the [ABI]-required minimum alignment of the type of the value that `val` points to.
///
/// Every reference to a value of type `T` must be a multiple of this number.
/// Every reference to a value of the type `T` must be a multiple of this number.
///
/// [ABI]: https://en.wikipedia.org/wiki/Application_binary_interface
///
Expand All @@ -264,7 +264,7 @@ pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize {

/// Returns the [ABI]-required minimum alignment of a type.
///
/// Every reference to a value of type `T` must be a multiple of this number.
/// Every reference to a value of the type `T` must be a multiple of this number.
///
/// This is the alignment used for struct fields. It may be smaller than the preferred alignment.
///
Expand All @@ -285,7 +285,7 @@ pub fn align_of<T>() -> usize {

/// Returns the [ABI]-required minimum alignment of the type of the value that `val` points to.
///
/// Every reference to a value of type `T` must be a multiple of this number.
/// Every reference to a value of the type `T` must be a multiple of this number.
///
/// [ABI]: https://en.wikipedia.org/wiki/Application_binary_interface
///
Expand Down