diff options
| author | bors <bors@rust-lang.org> | 2019-06-02 14:42:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-02 14:42:11 +0000 |
| commit | d461555e443a07bc75564b8322dc461efe7cea7c (patch) | |
| tree | 142116ba2b27c046e6b5bbb8306d620d1ace9d9d /src/libcore | |
| parent | 4c7bb8b0d9d3c5149c8ad12b59604ccb57e8accc (diff) | |
| parent | aaf264b999ff4ed9f0b65757076ed3a8e64dc9b9 (diff) | |
| download | rust-d461555e443a07bc75564b8322dc461efe7cea7c.tar.gz rust-d461555e443a07bc75564b8322dc461efe7cea7c.zip | |
Auto merge of #61460 - Centril:rollup-8txhjx4, r=Centril
Rollup of 6 pull requests Successful merges: - #61380 (Fix some issues with `unwrap_usize` instead of `assert_usize`) - #61423 (codegen: change `$6d$` to `$u6d$`) - #61438 (Point at individual type args on arg count mismatch) - #61441 (Tweak wording when encountering `fn` call in pattern) - #61451 (Fix missing semicolon in doc) - #61458 (Fix typo in AsRef doc) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/convert.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs index a2796ad0cf0..6215bf5cd65 100644 --- a/src/libcore/convert.rs +++ b/src/libcore/convert.rs @@ -129,7 +129,7 @@ pub const fn identity<T>(x: T) -> T { x } /// # Examples /// /// By using trait bounds we can accept arguments of different types as long as they can be -/// converted a the specified type `T`. +/// converted to the specified type `T`. /// /// For example: By creating a generic function that takes an `AsRef<str>` we express that we /// want to accept all references that can be converted to `&str` as an argument. |