[rust] Add rust_bench_test and rust_doc_test rules and improve usability of rust_test rule.

* Add rust_bench_test rule to run benchmark tests
* Add rust_doc_test rule to run Rust documentation tests.
* Enable rust_test and rust_bench_test to depend directly on a rust_library target.
* Rename rust_docs rule to rust_doc for consistency.

RELNOTES: [rust] Add rust_bench_test and rust_doc_test rules and improve usability of rust_test tule.

--
MOS_MIGRATED_REVID=104648497

6 files changed, 144 insertions, 8 deletions

diff --git a/examples/rust/fibonacci/BUILD b/examples/rust/fibonacci/BUILD
new file mode 100644
index 0000000000..a29e2123ba
--- /dev/null
+++ b/examples/rust/fibonacci/BUILD
@@ -0,0 +1,36 @@
+package(default_visibility = ["//visibility:public"])
+
+load(
+    "/tools/build_rules/rust/rust",
+    "rust_library",
+    "rust_test",
+    "rust_bench_test",
+    "rust_doc",
+    "rust_doc_test",
+)
+
+rust_library(
+    name = "fibonacci",
+    srcs = ["src/lib.rs"],
+)
+
+rust_test(
+    name = "fibonacci_test",
+    deps = [":fibonacci"],
+)
+
+rust_bench_test(
+    name = "fibonacci_bench",
+    srcs = ["benches/fibonacci_bench.rs"],
+    deps = [":fibonacci"],
+)
+
+rust_doc(
+    name = "fibonacci_doc",
+    dep = ":fibonacci",
+)
+
+rust_doc_test(
+    name = "fibonacci_doc_test",
+    dep = ":fibonacci",
+)
diff --git a/examples/rust/fibonacci/benches/fibonacci_bench.rs b/examples/rust/fibonacci/benches/fibonacci_bench.rs
new file mode 100644
index 0000000000..80aa1a84ce
--- /dev/null
+++ b/examples/rust/fibonacci/benches/fibonacci_bench.rs
@@ -0,0 +1,25 @@
+// Copyright 2015 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![feature(test)]
+
+extern crate test;
+extern crate fibonacci;
+
+use test::Bencher;
+
+#[bench]
+fn bench_fibonacci(b: &mut Bencher) {
+    b.iter(|| fibonacci::fibonacci(40));
+}
diff --git a/examples/rust/fibonacci/src/lib.rs b/examples/rust/fibonacci/src/lib.rs
new file mode 100644
index 0000000000..d8ae6e3fca
--- /dev/null
+++ b/examples/rust/fibonacci/src/lib.rs
@@ -0,0 +1,48 @@
+// Copyright 2015 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// Returns the nth Fibonacci number.
+///
+/// # Examples
+///
+/// ```
+/// fibonacci::fibonacci(5)
+/// ```
+pub fn fibonacci(n: u64) -> u64 {
+    if n < 2 {
+        return n;
+    }
+    let mut n1: u64 = 0;
+    let mut n2: u64 = 1;
+    for _ in 1..n {
+        let sum = n1 + n2;
+        n1 = n2;
+        n2 = sum;
+    }
+    n2
+}
+
+#[cfg(test)]
+mod test {
+    use super::fibonacci;
+
+    #[test]
+    fn test_fibonacci() {
+        let numbers : Vec<u64> =
+            vec![0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144];
+        for (i, number) in numbers.iter().enumerate() {
+            assert_eq!(*number, fibonacci(i as u64));
+        }
+    }
+}
diff --git a/examples/rust/hello_lib/BUILD b/examples/rust/hello_lib/BUILD
index a075f8b168..90941e6a42 100644
--- a/examples/rust/hello_lib/BUILD
+++ b/examples/rust/hello_lib/BUILD
@@ -1,6 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_rules/rust/rust", "rust_library", "rust_docs", "rust_test")
+load(
+    "/tools/build_rules/rust/rust",
+    "rust_library",
+    "rust_test",
+    "rust_doc",
+    "rust_doc_test",
+)
 
 rust_library(
     name = "hello_lib",
@@ -10,13 +16,23 @@ rust_library(
     ],
 )
 
-rust_docs(
-    name = "hello_lib_docs",
-    dep = ":hello_lib",
+rust_test(
+    name = "hello_lib_test",
+    deps = [":hello_lib"],
 )
 
 rust_test(
-    name = "greeting",
+    name = "greeting_test",
     srcs = ["tests/greeting.rs"],
     deps = [":hello_lib"],
 )
+
+rust_doc(
+    name = "hello_lib_doc",
+    dep = ":hello_lib",
+)
+
+rust_doc_test(
+    name = "hello_lib_doc_test",
+    dep = ":hello_lib",
+)
diff --git a/examples/rust/hello_lib/src/greeter.rs b/examples/rust/hello_lib/src/greeter.rs
index 2a7d7153b9..bf332e4bd1 100644
--- a/examples/rust/hello_lib/src/greeter.rs
+++ b/examples/rust/hello_lib/src/greeter.rs
@@ -60,3 +60,14 @@ impl Greeter {
         println!("{} {}", &self.greeting, thing);
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::Greeter;
+
+    #[test]
+    fn test_greeting() {
+        let hello = Greeter::new("Hi");
+        assert_eq!("Hi Rust", hello.greeting("Rust"));
+    }
+}
diff --git a/examples/rust/hello_world/BUILD b/examples/rust/hello_world/BUILD
index ccd87f1b93..1f5365675b 100644
--- a/examples/rust/hello_world/BUILD
+++ b/examples/rust/hello_world/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_rules/rust/rust", "rust_binary", "rust_docs")
+load("/tools/build_rules/rust/rust", "rust_binary", "rust_doc")
 
 rust_binary(
     name = "hello_world",
@@ -8,7 +8,7 @@ rust_binary(
     deps = ["//examples/rust/hello_lib"],
 )
 
-rust_docs(
-    name = "hello_world_docs",
+rust_doc(
+    name = "hello_world_doc",
     dep = ":hello_world",
 )