Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support clippy aspect in unit tests as well #546

Merged
merged 2 commits into from
Jan 14, 2021
Merged

support clippy aspect in unit tests as well #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf4608b
support clippy aspect in unit tests as well
dae Dec 30, 2020
34d6bf1
fix clippy lints in tests
dae Dec 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions examples/cargo/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// theoretically this should be safe, as unit tests are built without
// optimizations
#![allow(clippy::assertions_on_constants)]
mod test {
#[test]
fn test_env_contents() {
Expand Down
20 changes: 6 additions & 14 deletions examples/ffi/rust_calling_c/src/matrix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,34 +117,26 @@ mod test {

#[test]
fn test_size() {
let matrix = Matrix::new(2, 4, &vec![11, 12, 13, 14,
21, 22, 23, 24]);
let matrix = Matrix::new(2, 4, &[11, 12, 13, 14, 21, 22, 23, 24]);
assert_eq!(2, matrix.rows());
assert_eq!(4, matrix.cols());
}

#[test]
fn test_equal() {
let matrix_a = Matrix::new(2, 4, &vec![11, 12, 13, 14,
21, 22, 23, 24]);
let matrix_b = Matrix::new(2, 4, &vec![11, 12, 13, 14,
21, 22, 23, 24]);
let matrix_a = Matrix::new(2, 4, &[11, 12, 13, 14, 21, 22, 23, 24]);
let matrix_b = Matrix::new(2, 4, &[11, 12, 13, 14, 21, 22, 23, 24]);
assert!(matrix_a.equal(&matrix_b));

let matrix_c = Matrix::new(2, 4, &vec![12, 13, 14, 15,
23, 24, 25, 26]);
let matrix_c = Matrix::new(2, 4, &[12, 13, 14, 15, 23, 24, 25, 26]);
assert!(!matrix_a.equal(&matrix_c));
}

#[test]
fn test_transpose() {
let mut matrix = Matrix::new(2, 4, &vec![11, 12, 13, 14,
21, 22, 23, 24]);
let mut matrix = Matrix::new(2, 4, &[11, 12, 13, 14, 21, 22, 23, 24]);
matrix.transpose();
let expected = Matrix::new(4, 2, &vec![11, 21,
12, 22,
13, 23,
14, 24]);
let expected = Matrix::new(4, 2, &[11, 21, 12, 22, 13, 23, 14, 24]);
assert!(matrix.equal(&expected));
}
}
11 changes: 8 additions & 3 deletions rust/private/clippy.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,17 @@ def _clippy_aspect_impl(target, ctx):
if CrateInfo not in target:
return []
rust_srcs = _rust_sources(target, ctx.rule)
if rust_srcs == []:
return []

toolchain = find_toolchain(ctx)
crate_info = target[CrateInfo]
root = crate_root_src(ctx.rule.attr, rust_srcs, crate_info.type)

if crate_info.is_test:
root = crate_info.root
else:
if rust_srcs == []:
# nothing to do
return []
root = crate_root_src(ctx.rule.attr, rust_srcs, crate_info.type)

dep_info, build_info = collect_deps(
ctx.label,
Expand Down