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 6 pull requests #71985

Merged
merged 22 commits into from
May 7, 2020
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9ed9200
use trait_object_dummy_self instead of err
mark-i-m May 6, 2020
96d4e0b
Add test for #29988
JohnTitor May 6, 2020
be2d553
Add test for #34979
JohnTitor May 6, 2020
f22bc7b
Add some tests for #67945
JohnTitor May 6, 2020
8e76663
test: Fix warnings in `rust_test_helpers.c`
petrochenkov May 6, 2020
6425413
grammar: which vs that
jsoref May 6, 2020
39b5b70
grammar: count-agreement default ... is
jsoref May 6, 2020
5f54ce7
grammar: disambiguate space-character
jsoref May 6, 2020
c8aba78
grammar: subject-verb not subject-verb-verb
jsoref May 6, 2020
488e660
grammar: noun not verb
jsoref May 6, 2020
5d2d7e7
grammar: stray comma
jsoref May 6, 2020
eb12784
grammar: simplify to avoid that
jsoref May 6, 2020
6c8c3f8
grammar: dealing-with
jsoref May 6, 2020
d1ea287
use hex for pointers in Miri error messages; refine vtable error message
RalfJung May 7, 2020
d14f000
Allow a few warnings.
steveklabnik May 7, 2020
d717e55
Add some skip flags
JohnTitor May 7, 2020
037ae40
Rollup merge of #71938 - mark-i-m:de-abuse-err-4, r=eddyb
Dylan-DPC May 7, 2020
480f718
Rollup merge of #71952 - JohnTitor:add-tests, r=Dylan-DPC
Dylan-DPC May 7, 2020
9e4a745
Rollup merge of #71959 - petrochenkov:chelpers, r=Mark-Simulacrum
Dylan-DPC May 7, 2020
2e9db8d
Rollup merge of #71962 - jsoref:grammar, r=Dylan-DPC
Dylan-DPC May 7, 2020
806089a
Rollup merge of #71972 - RalfJung:miri-validity-error-refine, r=oli-obk
Dylan-DPC May 7, 2020
c818e84
Rollup merge of #71980 - steveklabnik:warnings-fixes, r=Mark-Simulacrum
Dylan-DPC May 7, 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/liballoc/fmt.rs
Original file line number Diff line number Diff line change
@@ -50,8 +50,8 @@
//! The internal iterator over the argument has not been advanced by the time
//! the first `{}` is seen, so it prints the first argument. Then upon reaching
//! the second `{}`, the iterator has advanced forward to the second argument.
//! Essentially, parameters which explicitly name their argument do not affect
//! parameters which do not name an argument in terms of positional specifiers.
//! Essentially, parameters that explicitly name their argument do not affect
//! parameters that do not name an argument in terms of positional specifiers.
//!
//! A format string is required to use all of its arguments, otherwise it is a
//! compile-time error. You may refer to the same argument more than once in the
@@ -60,7 +60,7 @@
//! ## Named parameters
//!
//! Rust itself does not have a Python-like equivalent of named parameters to a
//! function, but the [`format!`] macro is a syntax extension which allows it to
//! function, but the [`format!`] macro is a syntax extension that allows it to
//! leverage named parameters. Named parameters are listed at the end of the
//! argument list and have the syntax:
//!
@@ -77,7 +77,7 @@
//! ```
//!
//! It is not valid to put positional parameters (those without names) after
//! arguments which have names. Like with positional parameters, it is not
//! arguments that have names. Like with positional parameters, it is not
//! valid to provide named parameters that are unused by the format string.
//!
//! # Formatting Parameters