diff options
author | David Chen <dzc@google.com> | 2015-07-30 11:47:06 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2015-07-30 15:42:59 +0000 |
commit | e449d50a64f400584abe9439de1a06a6f82de5c1 (patch) | |
tree | b099a77eb4aed74db3e3d32b7c6ac47961d9bf31 | |
parent | b4b19bcb0b7c010155b0b3f0aaa38be9dd151195 (diff) |
Restore Rust examples and add Rust rule tests that were inadvertently excluded.
--
MOS_MIGRATED_REVID=99464781
-rw-r--r-- | examples/rust/hello_lib/BUILD | 17 | ||||
-rw-r--r-- | examples/rust/hello_lib/src/greeter.rs | 31 | ||||
-rw-r--r-- | examples/rust/hello_lib/src/lib.rs | 15 | ||||
-rw-r--r-- | examples/rust/hello_lib/tests/greeting.rs | 23 | ||||
-rw-r--r-- | examples/rust/hello_world/BUILD | 9 | ||||
-rw-r--r-- | examples/rust/hello_world/src/main.rs | 22 | ||||
-rw-r--r-- | tools/build_rules/rust/test/BUILD | 3 | ||||
-rw-r--r-- | tools/build_rules/rust/test/rust_rule_test.bzl | 63 |
8 files changed, 183 insertions, 0 deletions
diff --git a/examples/rust/hello_lib/BUILD b/examples/rust/hello_lib/BUILD new file mode 100644 index 0000000000..64cc935b27 --- /dev/null +++ b/examples/rust/hello_lib/BUILD @@ -0,0 +1,17 @@ +package(default_visibility = ["//visibility:public"]) + +load("/tools/build_rules/rust/rust", "rust_library", "rust_test") + +rust_library( + name = "hello_lib", + srcs = [ + "src/greeter.rs", + "src/lib.rs", + ], +) + +rust_test( + name = "greeting", + srcs = ["tests/greeting.rs"], + deps = [":hello_lib"], +) diff --git a/examples/rust/hello_lib/src/greeter.rs b/examples/rust/hello_lib/src/greeter.rs new file mode 100644 index 0000000000..be59ff888d --- /dev/null +++ b/examples/rust/hello_lib/src/greeter.rs @@ -0,0 +1,31 @@ +// Copyright 2015 Google Inc. 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. + +pub struct Greeter { + greeting: String, +} + +impl Greeter { + pub fn new(greeting: &str) -> Greeter { + Greeter { greeting: greeting.to_string(), } + } + + pub fn greeting(&self, thing: &str) -> String { + format!("{} {}", &self.greeting, thing) + } + + pub fn greet(&self, thing: &str) { + println!("{} {}", &self.greeting, thing); + } +} diff --git a/examples/rust/hello_lib/src/lib.rs b/examples/rust/hello_lib/src/lib.rs new file mode 100644 index 0000000000..8f2b5a11f5 --- /dev/null +++ b/examples/rust/hello_lib/src/lib.rs @@ -0,0 +1,15 @@ +// Copyright 2015 Google Inc. 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. + +pub mod greeter; diff --git a/examples/rust/hello_lib/tests/greeting.rs b/examples/rust/hello_lib/tests/greeting.rs new file mode 100644 index 0000000000..842ba2983b --- /dev/null +++ b/examples/rust/hello_lib/tests/greeting.rs @@ -0,0 +1,23 @@ +// Copyright 2015 Google Inc. 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. + +extern crate hello_lib; + +use hello_lib::greeter; + +#[test] +fn test_greeting() { + let hello = greeter::Greeter::new("Hello"); + assert_eq!("Hello world", hello.greeting("world")); +} diff --git a/examples/rust/hello_world/BUILD b/examples/rust/hello_world/BUILD new file mode 100644 index 0000000000..e774dcc835 --- /dev/null +++ b/examples/rust/hello_world/BUILD @@ -0,0 +1,9 @@ +package(default_visibility = ["//visibility:public"]) + +load("/tools/build_rules/rust/rust", "rust_binary") + +rust_binary( + name = "hello_world", + srcs = ["src/main.rs"], + deps = ["//examples/rust/hello_lib"], +) diff --git a/examples/rust/hello_world/src/main.rs b/examples/rust/hello_world/src/main.rs new file mode 100644 index 0000000000..2e837ce0bb --- /dev/null +++ b/examples/rust/hello_world/src/main.rs @@ -0,0 +1,22 @@ +// Copyright 2015 Google Inc. 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. + +extern crate hello_lib; + +use hello_lib::greeter; + +fn main() { + let hello = greeter::Greeter::new("Hello"); + hello.greet("world"); +} diff --git a/tools/build_rules/rust/test/BUILD b/tools/build_rules/rust/test/BUILD new file mode 100644 index 0000000000..84dc1bca35 --- /dev/null +++ b/tools/build_rules/rust/test/BUILD @@ -0,0 +1,3 @@ +load("rust_rule_test", "rust_rule_test") + +rust_rule_test("//examples/rust") diff --git a/tools/build_rules/rust/test/rust_rule_test.bzl b/tools/build_rules/rust/test/rust_rule_test.bzl new file mode 100644 index 0000000000..e9f957e0fb --- /dev/null +++ b/tools/build_rules/rust/test/rust_rule_test.bzl @@ -0,0 +1,63 @@ +"""Tests for rust rules.""" +# +# Copyright 2015 Google Inc. 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. + +load("/third_party/bazel/tools/build_rules/rust/rust", + "rust_library", "rust_binary", "rust_test") +load("/third_party/bazel/tools/build_rules/test_rules", + "success_target", + "successful_test", + "failure_target", + "failed_test", + "assert_", + "strip_prefix", + "expectation_description", + "check_results", + "load_results", + "analysis_results", + "rule_test", + "file_test") + + +def _rust_library_test(package): + rule_test( + name="hello_lib_rule_test", + generates=["libhello_lib.rlib"], + provides={ + "rust_lib": "/libhello_lib.rlib$", + "transitive_libs": "^\\[\\]$"}, + rule=package + "/hello_lib:hello_lib") + + +def _rust_binary_test(package): + rule_test( + name="hello_world_rule_test", + generates=["hello_world"], + rule=package + "/hello_world:hello_world") + + +def _rust_test_test(package): + """Issue rule tests for rust_test.""" + rule_test( + name="greeting_rule_test", + generates=["greeting"], + rule=package + "/hello_lib:greeting") + + +def rust_rule_test(package): + """Issue simple tests on rust rules.""" + _rust_library_test(package) + _rust_binary_test(package) + _rust_test_test(package) |