diff options
| author | bors <bors@rust-lang.org> | 2019-10-01 22:04:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-01 22:04:23 +0000 |
| commit | 7130fc54e05e247f93c7ecc2d10f56b314c97831 (patch) | |
| tree | 978f8c357723da483f92ac6791f82f5f55172f74 /src/liballoc/string.rs | |
| parent | 702b45e409495a41afcccbe87a251a692b0cefab (diff) | |
| parent | adc0dc5871ac49543ae94827e7c4d411756e3d47 (diff) | |
| download | rust-7130fc54e05e247f93c7ecc2d10f56b314c97831.tar.gz rust-7130fc54e05e247f93c7ecc2d10f56b314c97831.zip | |
Auto merge of #64972 - Centril:rollup-gcawast, r=Centril
Rollup of 7 pull requests
Successful merges:
- #63416 (apfloat: improve doc comments)
- #64820 (BTreeSet intersection, is_subset & difference optimizations)
- #64910 (syntax: cleanup param, method, and misc parsing)
- #64912 (Remove unneeded `fn main` blocks from docs)
- #64933 (Fixes #64919. Suggest fix based on operator precendence.)
- #64943 (Add lower bound doctests for `saturating_{add,sub}` signed ints)
- #64950 (Simplify interners)
Failed merges:
r? @ghost
Diffstat (limited to 'src/liballoc/string.rs')
| -rw-r--r-- | src/liballoc/string.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index abe50fdb7a3..639124e26cc 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -164,10 +164,8 @@ use crate::vec::Vec; /// /// fn example_func<A: TraitExample>(example_arg: A) {} /// -/// fn main() { -/// let example_string = String::from("example_string"); -/// example_func(&example_string); -/// } +/// let example_string = String::from("example_string"); +/// example_func(&example_string); /// ``` /// /// There are two options that would work instead. The first would be to |
