Skip to content

Commit

Permalink
Restore Rust examples and add Rust rule tests that were inadvertently…
Browse files Browse the repository at this point in the history
… excluded.

--
MOS_MIGRATED_REVID=99464781
  • Loading branch information
davidzchen authored and damienmg committed Jul 30, 2015
1 parent b4b19bc commit e449d50
Show file tree
Hide file tree
Showing 8 changed files with 183 additions and 0 deletions.
17 changes: 17 additions & 0 deletions examples/rust/hello_lib/BUILD
Original file line number Diff line number Diff line change
@@ -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"],
)
31 changes: 31 additions & 0 deletions examples/rust/hello_lib/src/greeter.rs
Original file line number Diff line number Diff line change
@@ -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);
}
}
15 changes: 15 additions & 0 deletions examples/rust/hello_lib/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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;
23 changes: 23 additions & 0 deletions examples/rust/hello_lib/tests/greeting.rs
Original file line number Diff line number Diff line change
@@ -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"));
}
9 changes: 9 additions & 0 deletions examples/rust/hello_world/BUILD
Original file line number Diff line number Diff line change
@@ -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"],
)
22 changes: 22 additions & 0 deletions examples/rust/hello_world/src/main.rs
Original file line number Diff line number Diff line change
@@ -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");
}
3 changes: 3 additions & 0 deletions tools/build_rules/rust/test/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
load("rust_rule_test", "rust_rule_test")

rust_rule_test("//examples/rust")
63 changes: 63 additions & 0 deletions tools/build_rules/rust/test/rust_rule_test.bzl
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit e449d50

Please sign in to comment.