Auto merge of #3544 - flip1995:rollup, r=flip1995

Rollup of 3 pull requests

Successful merges:

 - #3509 (Fix doc_markdown off by one issue)
 - #3539 (Fix rvm/gpg bug in travis osx build)
 - #3540 (rustup https://github.com/rust-lang/rust/pull/56092)

Failed merges:

r? @ghost

.travis.yml

@@ -18,15 +18,6 @@ env:
  global:
    - RUST_BACKTRACE=1
 
-before_install:
- - |
-    # work-around for issue https://github.com/travis-ci/travis-ci/issues/6307
-    # might not be necessary in the future
-    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-     command curl -sSL https://rvm.io/mpapis.asc | gpg --import -
-     rvm get stable
-    fi
-
 install:
   - |
     if [ -z ${INTEGRATION} ]; then

clippy_lints/src/doc.rs

@@ -238,7 +238,7 @@ fn check_doc<'a, Events: Iterator<Item = (usize, pulldown_cmark::Event<'a>)>>(
 }
 
 fn check_text(cx: &EarlyContext<'_>, valid_idents: &[String], text: &str, span: Span) {
-    for word in text.split_whitespace() {
+    for word in text.split(|c: char| c.is_whitespace() || c == '\'') {
         // Trim punctuation as in `some comment (see foo::bar).`
         //                                                   ^^
         // Or even as in `_foo bar_` which is emphasized.

tests/ui/cast_alignment.rs

@@ -9,8 +9,8 @@
 
 //! Test casts for alignment issues
 
-#![feature(libc)]
 
+#![feature(rustc_private)]
 extern crate libc;
 
 #[warn(clippy::cast_ptr_alignment)]

tests/ui/doc.rs

@@ -177,3 +177,7 @@ fn issue_1832() {}
 
 /// Ok: CamelCase (It should not be surrounded by backticks)
 fn issue_2395() {}
+
+/// An iterator over mycrate::Collection's values.
+/// It should not lint a `'static` lifetime in ticks.
+fn issue_2210() {}

tests/ui/doc.stderr

@@ -180,5 +180,11 @@ error: you should put bare URLs between `<`/`>` or make a proper Markdown link
 175 | /// Not ok: http://www.unicode.org/reports/tr9/#Reordering_Resolved_Levels
     |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 30 previous errors
+error: you should put `mycrate::Collection` between ticks in the documentation
+   --> $DIR/doc.rs:181:22
+    |
+181 | /// An iterator over mycrate::Collection's values.
+    |                      ^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 31 previous errors