Skip to content

Commit 8446a2a

Browse files
committed
Rename tests/ffi/module.rs to alias.rs to clarify purpose
1 parent b1a0055 commit 8446a2a

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

tests/BUCK

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ rust_test(
77
rust_library(
88
name = "ffi",
99
srcs = [
10+
"ffi/alias.rs",
1011
"ffi/lib.rs",
11-
"ffi/module.rs",
1212
],
1313
crate = "cxx_test_suite",
1414
deps = [
@@ -21,8 +21,8 @@ cxx_library(
2121
name = "impl",
2222
srcs = [
2323
"ffi/tests.cc",
24+
":gen-alias-source",
2425
":gen-lib-source",
25-
":gen-module-source",
2626
],
2727
header_namespace = "cxx-test-suite",
2828
headers = {
@@ -47,8 +47,8 @@ genrule(
4747
)
4848

4949
genrule(
50-
name = "gen-module-source",
51-
srcs = ["ffi/module.rs"],
52-
out = "module.rs.cc",
50+
name = "gen-alias-source",
51+
srcs = ["ffi/alias.rs"],
52+
out = "alias.rs.cc",
5353
cmd = "$(exe //:codegen) ${SRCS} > ${OUT}",
5454
)

tests/BUILD

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ rust_test(
99
rust_library(
1010
name = "cxx_test_suite",
1111
srcs = [
12+
"ffi/alias.rs",
1213
"ffi/lib.rs",
13-
"ffi/module.rs",
1414
],
1515
deps = [
1616
":impl",
@@ -22,8 +22,8 @@ cc_library(
2222
name = "impl",
2323
srcs = [
2424
"ffi/tests.cc",
25+
":gen-alias-source",
2526
":gen-lib-source",
26-
":gen-module-source",
2727
],
2828
hdrs = ["ffi/tests.h"],
2929
include_prefix = "cxx-test-suite",
@@ -57,9 +57,9 @@ cc_library(
5757
)
5858

5959
genrule(
60-
name = "gen-module-source",
61-
srcs = ["ffi/module.rs"],
62-
outs = ["module.rs.cc"],
60+
name = "gen-alias-source",
61+
srcs = ["ffi/alias.rs"],
62+
outs = ["alias.rs.cc"],
6363
cmd = "$(location //:codegen) $< > $@",
6464
tools = ["//:codegen"],
6565
)
File renamed without changes.

tests/ffi/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fn main() {
33
return;
44
}
55

6-
let sources = vec!["lib.rs", "module.rs"];
6+
let sources = vec!["alias.rs", "lib.rs"];
77
cxx_build::bridges(sources)
88
.file("tests.cc")
99
.flag_if_supported(cxxbridge_flags::STD)

tests/ffi/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
clippy::trivially_copy_pass_by_ref
55
)]
66

7-
pub mod module;
7+
pub mod alias;
88

99
use cxx::{CxxString, UniquePtr};
1010
use std::fmt::{self, Display};

tests/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use cxx_test_suite::ffi;
1+
use cxx_test_suite::{alias, ffi};
22
use std::cell::Cell;
33
use std::ffi::CStr;
44

@@ -89,7 +89,7 @@ fn test_c_take() {
8989
check!(ffi::c_take_shared(ffi::Shared { z: 2020 }));
9090
check!(ffi::c_take_box(Box::new(2020)));
9191
check!(ffi::c_take_ref_c(&unique_ptr));
92-
check!(cxx_test_suite::module::ffi::c_take_unique_ptr(unique_ptr));
92+
check!(alias::ffi::c_take_unique_ptr(unique_ptr));
9393
check!(ffi::c_take_str("2020"));
9494
check!(ffi::c_take_sliceu8(b"2020"));
9595
check!(ffi::c_take_rust_string("2020".to_owned()));

0 commit comments

Comments
 (0)