mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-26 04:53:34 +00:00
Auto merge of #16413 - Urhengulas:clippy-ci, r=Veykril
internal: Add `clippy` to CI Follow-up to #16401
This commit is contained in:
commit
da4d5f8f29
7 changed files with 15 additions and 11 deletions
6
.github/workflows/ci.yaml
vendored
6
.github/workflows/ci.yaml
vendored
|
@ -90,7 +90,7 @@ jobs:
|
|||
- name: Switch to stable toolchain
|
||||
run: |
|
||||
rustup update --no-self-update stable
|
||||
rustup component add --toolchain stable rust-src
|
||||
rustup component add --toolchain stable rust-src clippy
|
||||
rustup default stable
|
||||
|
||||
- name: Run analysis-stats on rust-analyzer
|
||||
|
@ -103,6 +103,10 @@ jobs:
|
|||
RUSTC_BOOTSTRAP: 1
|
||||
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats --with-deps $(rustc --print sysroot)/lib/rustlib/src/rust/library/std
|
||||
|
||||
- name: clippy
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
run: cargo clippy --all-targets
|
||||
|
||||
# Weird targets to catch non-portable code
|
||||
rust-cross:
|
||||
if: github.repository == 'rust-lang/rust-analyzer'
|
||||
|
|
|
@ -235,7 +235,7 @@ impl Attr {
|
|||
let (path, input) = tt.split_at(path_end);
|
||||
let path = Interned::new(ModPath::from_tt(db, path)?);
|
||||
|
||||
let input = match input.get(0) {
|
||||
let input = match input.first() {
|
||||
Some(tt::TokenTree::Subtree(tree)) => {
|
||||
Some(Interned::new(AttrInput::TokenTree(Box::new(tree.clone()))))
|
||||
}
|
||||
|
|
|
@ -232,7 +232,7 @@ fn convert_path(
|
|||
ast::PathSegmentKind::SuperKw => {
|
||||
let mut deg = 1;
|
||||
let mut next_segment = None;
|
||||
while let Some(segment) = segments.next() {
|
||||
for segment in segments.by_ref() {
|
||||
match segment.kind()? {
|
||||
ast::PathSegmentKind::SuperKw => deg += 1,
|
||||
ast::PathSegmentKind::Name(name) => {
|
||||
|
|
|
@ -237,7 +237,7 @@ impl<'p> MatchCheckCtx<'p> {
|
|||
ctor = Or;
|
||||
// Collect here because `Arena::alloc_extend` panics on reentrancy.
|
||||
let subpats: SmallVec<[_; 2]> =
|
||||
pats.into_iter().map(|pat| self.lower_pat(pat)).collect();
|
||||
pats.iter().map(|pat| self.lower_pat(pat)).collect();
|
||||
fields = self.pattern_arena.alloc_extend(subpats);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1715,7 +1715,7 @@ impl Evaluator<'_> {
|
|||
let v: Cow<'_, [u8]> = if size != v.len() {
|
||||
// Handle self enum
|
||||
if size == 16 && v.len() < 16 {
|
||||
Cow::Owned(pad16(&v, false).to_vec())
|
||||
Cow::Owned(pad16(v, false).to_vec())
|
||||
} else if size < 16 && v.len() == 16 {
|
||||
Cow::Borrowed(&v[0..size])
|
||||
} else {
|
||||
|
|
|
@ -311,7 +311,7 @@ fn modpath_from_str(link: &str) -> Option<ModPath> {
|
|||
"self" => PathKind::Super(0),
|
||||
"super" => {
|
||||
let mut deg = 1;
|
||||
while let Some(segment) = parts.next() {
|
||||
for segment in parts.by_ref() {
|
||||
if segment == "super" {
|
||||
deg += 1;
|
||||
} else {
|
||||
|
|
|
@ -109,11 +109,11 @@ fn main() {
|
|||
let mut artifact_path = None;
|
||||
for message in Message::parse_stream(output.stdout.as_slice()) {
|
||||
if let Message::CompilerArtifact(artifact) = message.unwrap() {
|
||||
if artifact.target.kind.contains(&"proc-macro".to_string()) {
|
||||
if artifact.package_id.repr.starts_with(&repr) || artifact.package_id.repr == pkgid
|
||||
{
|
||||
artifact_path = Some(PathBuf::from(&artifact.filenames[0]));
|
||||
}
|
||||
if artifact.target.kind.contains(&"proc-macro".to_string())
|
||||
&& (artifact.package_id.repr.starts_with(&repr)
|
||||
|| artifact.package_id.repr == pkgid)
|
||||
{
|
||||
artifact_path = Some(PathBuf::from(&artifact.filenames[0]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue