about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-21 12:56:24 +0000
committerbors <bors@rust-lang.org>2015-10-21 12:56:24 +0000
commit58d782d777eccf1c7e441a930c54df3de6f91ca2 (patch)
tree8c44315e3ba65cdc3ab8289ba08c911f744f5fd2
parent26c14a488b0d0b039faf5684c7042ba48ff0cea8 (diff)
parentf820dc84ca90b2d9955a66dfad44c2767e7bb059 (diff)
downloadrust-58d782d777eccf1c7e441a930c54df3de6f91ca2.tar.gz
rust-58d782d777eccf1c7e441a930c54df3de6f91ca2.zip
Auto merge of #29179 - cjdrake:fixup, r=steveklabnik
This is a pretty trivial change. My eye caught some inconsistent whitespace while perusing compiler errors tonight. Specifically, I changed `//correct` to `// correct`, and got rid of some trailing whitespace that isn't seen in other code snippets.
-rw-r--r--src/librustc_typeck/diagnostics.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs
index 3b6cc37181e..1c07d118f94 100644
--- a/src/librustc_typeck/diagnostics.rs
+++ b/src/librustc_typeck/diagnostics.rs
@@ -1390,8 +1390,7 @@ enum Bar { A(u8), B(&bool), }        // error
 enum Bar<'a> { A(u8), B(&'a bool), } // correct
 
 type MyStr = &str;        // error
-type MyStr<'a> = &'a str; //correct
-
+type MyStr<'a> = &'a str; // correct
 ```
 
 Lifetime elision is a special, limited kind of inference for lifetimes in