Skip to content

Commit 4c2fa90

Browse files
authored
Merge branch 'dtolnay:master' into master
2 parents 0335ebf + 1ed4f58 commit 4c2fa90

File tree

9 files changed

+34
-25
lines changed

9 files changed

+34
-25
lines changed

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module(name = "cxx.rs")
22

33
bazel_dep(name = "bazel_skylib", version = "1.7.1")
4-
bazel_dep(name = "rules_rust", version = "0.51.0")
4+
bazel_dep(name = "rules_rust", version = "0.52.1")
55

66
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
77
rust.toolchain(

MODULE.bazel.lock

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/build/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,13 @@
6363
clippy::match_same_arms,
6464
clippy::module_name_repetitions,
6565
clippy::needless_doctest_main,
66+
clippy::needless_lifetimes,
6667
clippy::needless_pass_by_value,
6768
clippy::new_without_default,
6869
clippy::nonminimal_bool,
6970
clippy::or_fun_call,
7071
clippy::redundant_else,
72+
clippy::ref_option,
7173
clippy::shadow_unrelated,
7274
clippy::significant_drop_in_scrutinee,
7375
clippy::similar_names,

gen/cmd/src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
clippy::match_on_vec_items,
1616
clippy::match_same_arms,
1717
clippy::module_name_repetitions,
18+
clippy::needless_lifetimes,
1819
clippy::needless_pass_by_value,
1920
clippy::new_without_default,
2021
clippy::nonminimal_bool,
2122
clippy::or_fun_call,
2223
clippy::redundant_else,
24+
clippy::ref_option,
2325
clippy::shadow_unrelated,
2426
clippy::similar_names,
2527
clippy::single_match_else,

gen/lib/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@
2626
clippy::missing_errors_doc,
2727
clippy::module_name_repetitions,
2828
clippy::must_use_candidate,
29+
clippy::needless_lifetimes,
2930
clippy::needless_pass_by_value,
3031
clippy::new_without_default,
3132
clippy::nonminimal_bool,
3233
clippy::or_fun_call,
3334
clippy::redundant_else,
35+
clippy::ref_option,
3436
clippy::shadow_unrelated,
3537
clippy::similar_names,
3638
clippy::single_match_else,

gen/src/include.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ impl<'i, 'a> Extend<&'i Include> for Includes<'a> {
180180
}
181181
}
182182

183-
impl<'i> From<&'i syntax::Include> for Include {
183+
impl From<&syntax::Include> for Include {
184184
fn from(include: &syntax::Include) -> Self {
185185
Include {
186186
path: include.path.clone(),

macro/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
clippy::match_bool,
1313
clippy::match_same_arms,
1414
clippy::module_name_repetitions,
15+
clippy::needless_lifetimes,
1516
clippy::needless_pass_by_value,
1617
clippy::new_without_default,
1718
clippy::nonminimal_bool,
1819
clippy::or_fun_call,
1920
clippy::redundant_else,
21+
clippy::ref_option,
2022
clippy::shadow_unrelated,
2123
clippy::similar_names,
2224
clippy::single_match,

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@
396396
clippy::module_name_repetitions,
397397
clippy::must_use_candidate,
398398
clippy::needless_doctest_main,
399+
clippy::needless_lifetimes,
399400
clippy::new_without_default,
400401
clippy::or_fun_call,
401402
clippy::ptr_arg,

syntax/set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl<'s, 'a, T> Iterator for Iter<'s, 'a, T> {
110110
}
111111
}
112112

113-
impl<'a, T> Debug for OrderedSet<&'a T>
113+
impl<T> Debug for OrderedSet<&T>
114114
where
115115
T: Debug,
116116
{

0 commit comments

Comments
 (0)