Auto merge of rust-lang#5255 - matklad:rustdoc-features, r=alexcrichton

Restore --features args for cargo rustdoc

Closes rust-lang#5254

Author: bors

src/bin/commands/rustdoc.rs

@@ -26,6 +26,7 @@ pub fn cli() -> App {
             "Build all targets (default)",
         )
         .arg_release("Build artifacts in release mode, with optimizations")
+        .arg_features()
         .arg_manifest_path()
         .arg_message_format()
         .after_help(

tests/testsuite/rustdoc.rs

@@ -225,3 +225,29 @@ fn rustdoc_same_name_documents_lib() {
         )),
     );
 }
+
+#[test]
+fn features() {
+    let p = project("foo")
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.0.1"
+            authors = []
+
+            [features]
+            quux = []
+        "#,
+        )
+        .file("src/lib.rs", "")
+        .build();
+
+    assert_that(
+        p.cargo("rustdoc --verbose --features quux"),
+        execs()
+            .with_status(0)
+            .with_stderr_contains("[..]feature=[..]quux[..]"),
+    );
+}