diff options
| author | bors <bors@rust-lang.org> | 2018-02-24 07:55:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-24 07:55:34 +0000 |
| commit | 6070d3e47e5e9f15575a3bd33583358b52bc6eda (patch) | |
| tree | 1277310a9582461e3b0dbe8db1ceb6f5f173f3c9 /src/liballoc/string.rs | |
| parent | b0a8620ed639d5085d7e1cca3626681a6e4e328e (diff) | |
| parent | b26442a3cb12e988f70d9805b8bbfae52fd20d7d (diff) | |
| download | rust-6070d3e47e5e9f15575a3bd33583358b52bc6eda.tar.gz rust-6070d3e47e5e9f15575a3bd33583358b52bc6eda.zip | |
Auto merge of #48476 - Manishearth:rollup, r=Manishearth
Rollup of 12 pull requests - Successful merges: #47933, #48072, #48083, #48123, #48157, #48219, #48221, #48245, #48429, #48436, #48438, #48472 - Failed merges:
Diffstat (limited to 'src/liballoc/string.rs')
| -rw-r--r-- | src/liballoc/string.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index 8d99d0bc8f4..409d2ab287e 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -364,7 +364,7 @@ impl String { /// /// Given that the `String` is empty, this will not allocate any initial /// buffer. While that means that this initial operation is very - /// inexpensive, but may cause excessive allocation later, when you add + /// inexpensive, it may cause excessive allocation later when you add /// data. If you have an idea of how much data the `String` will hold, /// consider the [`with_capacity`] method to prevent excessive /// re-allocation. |