about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-04-06 16:02:04 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-04-07 17:54:34 -0700
commita30f28edad0244c855e9f4b52250efe4e28bc039 (patch)
tree387f959ec82e2c616791b4519e1a2d6559bfc9e5 /src
parent9ad133b4a14191a89687b45fa0deec3c6041a80d (diff)
downloadrust-a30f28edad0244c855e9f4b52250efe4e28bc039.tar.gz
rust-a30f28edad0244c855e9f4b52250efe4e28bc039.zip
rustdoc: Add a test for fixed issue #15347
Closes #15347
Diffstat (limited to 'src')
-rw-r--r--src/compiletest/runtest.rs1
-rw-r--r--src/test/rustdoc/issue-15347.rs15
2 files changed, 16 insertions, 0 deletions
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 301ce2b6f14..9d040fc8594 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -1175,6 +1175,7 @@ fn document(config: &Config, props: &TestProps,
                         out_dir.to_str().unwrap().to_string(),
                         testfile.to_str().unwrap().to_string()];
     args.extend(extra_args.iter().cloned());
+    args.extend(split_maybe_args(&props.compile_flags).into_iter());
     let args = ProcArgs {
         prog: config.rustdoc_path.to_str().unwrap().to_string(),
         args: args,
diff --git a/src/test/rustdoc/issue-15347.rs b/src/test/rustdoc/issue-15347.rs
new file mode 100644
index 00000000000..97c37bbc1ed
--- /dev/null
+++ b/src/test/rustdoc/issue-15347.rs
@@ -0,0 +1,15 @@
+// Copyright 2105 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags:--no-defaults --passes "collapse-docs" --passes "unindent-comments"
+
+// @has issue_15347/fn.foo.html
+#[doc(hidden)]
+pub fn foo() {}