diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-06-13 18:03:55 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-06-13 18:03:55 +0530 |
| commit | 2b8e80914ae86debe5252e8316fdee55afc0f4a1 (patch) | |
| tree | dc378321755d889a568afaf49656ad4de2c18e13 | |
| parent | 15aa3bbccc6777317d0bcc6fb04350171f3b61a3 (diff) | |
| parent | d46d229be78fd165795f5fc00bab6b2336519bb6 (diff) | |
| download | rust-2b8e80914ae86debe5252e8316fdee55afc0f4a1.tar.gz rust-2b8e80914ae86debe5252e8316fdee55afc0f4a1.zip | |
Rollup merge of #26256 - steveklabnik:gh25915, r=alexcrichton
Fixes #25915
| -rw-r--r-- | src/doc/trpl/lifetimes.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/trpl/lifetimes.md b/src/doc/trpl/lifetimes.md index 580960b7e80..11d651c5778 100644 --- a/src/doc/trpl/lifetimes.md +++ b/src/doc/trpl/lifetimes.md @@ -305,7 +305,7 @@ fn substr<'a>(s: &'a str, until: u32) -> &'a str; // expanded fn get_str() -> &str; // ILLEGAL, no inputs fn frob(s: &str, t: &str) -> &str; // ILLEGAL, two inputs -fn frob<'a, 'b>(s: &'a str, t: &'b str) -> &str; // Expanded: Output lifetime is unclear +fn frob<'a, 'b>(s: &'a str, t: &'b str) -> &str; // Expanded: Output lifetime is ambiguous fn get_mut(&mut self) -> &mut T; // elided fn get_mut<'a>(&'a mut self) -> &'a mut T; // expanded |