File tree 3 files changed +6
-15
lines changed
3 files changed +6
-15
lines changed Original file line number Diff line number Diff line change @@ -55,11 +55,6 @@ filegroup(
55
55
visibility = ["//:__subpackages__" ],
56
56
)
57
57
58
- TAGS = [
59
- # https://github.com/rust-lang/rust-clippy/issues/8470
60
- "noclippy" ,
61
- ]
62
-
63
58
rust_library (
64
59
name = "cargo_bazel" ,
65
60
srcs = glob (
@@ -72,7 +67,6 @@ rust_library(
72
67
exclude = ["src/**/*.rs" ],
73
68
),
74
69
proc_macro_deps = all_crate_deps (proc_macro = True ),
75
- tags = TAGS ,
76
70
version = VERSION ,
77
71
visibility = ["//visibility:public" ],
78
72
deps = all_crate_deps (normal = True ),
@@ -81,7 +75,6 @@ rust_library(
81
75
rust_binary (
82
76
name = "cargo_bazel_bin" ,
83
77
srcs = ["src/main.rs" ],
84
- tags = TAGS ,
85
78
version = VERSION ,
86
79
visibility = ["//visibility:public" ],
87
80
deps = [":cargo_bazel" ],
@@ -108,7 +101,6 @@ rust_test(
108
101
"CARGO" : "$(rootpath @rules_rust//rust/toolchain:current_exec_cargo_files)" ,
109
102
"RUSTC" : "$(rootpath @rules_rust//rust/toolchain:current_exec_rustc_files)" ,
110
103
},
111
- tags = TAGS ,
112
104
deps = [
113
105
"@rules_rust//tools/runfiles" ,
114
106
] + all_crate_deps (
Original file line number Diff line number Diff line change @@ -563,11 +563,10 @@ impl CrateContext {
563
563
let crate_name = sanitize_module_name ( & target. name ) ;
564
564
565
565
// Locate the crate's root source file relative to the package root normalized for unix
566
- let crate_root =
567
- pathdiff:: diff_paths ( target. src_path . to_string ( ) , package_root) . map (
568
- // Normalize the path so that it always renders the same regardless of platform
569
- |root| root. to_string_lossy ( ) . replace ( "\\ " , "/" ) ,
570
- ) ;
566
+ let crate_root = pathdiff:: diff_paths ( & target. src_path , package_root) . map (
567
+ // Normalize the path so that it always renders the same regardless of platform
568
+ |root| root. to_string_lossy ( ) . replace ( '\\' , "/" ) ,
569
+ ) ;
571
570
572
571
// Conditionally check to see if the dependencies is a build-script target
573
572
if include_build_scripts && kind == "custom-build" {
Original file line number Diff line number Diff line change @@ -96,7 +96,7 @@ impl<'a> SplicerKind<'a> {
96
96
!manifests. keys ( ) . any ( |path| {
97
97
let path_str = path. to_string_lossy ( ) . to_string ( ) ;
98
98
// Account for windows paths.
99
- let path_str = path_str. replace ( " \\ " , "/" ) ;
99
+ let path_str = path_str. replace ( '\\' , "/" ) ;
100
100
// Workspace members are represented as directories.
101
101
path_str. trim_end_matches ( "/Cargo.toml" ) . ends_with ( member)
102
102
} )
@@ -1015,7 +1015,7 @@ mod test {
1015
1015
// On windows, make sure we normalize the path to match what Cargo would
1016
1016
// otherwise use to populate metadata.
1017
1017
if cfg ! ( target_os = "windows" ) {
1018
- workspace_root = format ! ( "/{}" , workspace_root. replace( " \\ " , "/" ) )
1018
+ workspace_root = format ! ( "/{}" , workspace_root. replace( '\\' , "/" ) )
1019
1019
} ;
1020
1020
1021
1021
if is_root {
You can’t perform that action at this time.
0 commit comments