Merge branch 'master' into brianm-encoder

.travis.yml

@@ -16,7 +16,7 @@ matrix:
             - libssl-dev
       install:
         # For test coverage. In install step so that it can use cache.
-        - cargo tarpaulin --version || RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install cargo-tarpaulin
+        - cargo tarpaulin --version || RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install --force cargo-tarpaulin
   allow_failures:
     - rust: nightly
 

src/display.rs

@@ -1,10 +1,10 @@
 //! Enables base64'd output anywhere you might use a `Display` implementation, like a format string.
 //!
 //! ```
-//! use base64::{STANDARD, display::Base64Display};
+//! use base64::display::Base64Display;
 //!
 //! let data = vec![0x0, 0x1, 0x2, 0x3];
-//! let wrapper = Base64Display::with_config(&data, STANDARD);
+//! let wrapper = Base64Display::with_config(&data, base64::STANDARD);
 //!
 //! assert_eq!("base64: AAECAw==", format!("base64: {}", wrapper));
 //! ```

tests/encode.rs

@@ -94,7 +94,6 @@ fn encode_all_bytes_url() {
     );
 }
 
-#[test]
 #[test]
 fn encode_url_safe_without_padding() {
     let encoded = encode_config(b"alice", URL_SAFE_NO_PAD);