mirror of
https://github.com/rust-lang/rust-analyzer
synced 2025-01-15 22:54:00 +00:00
Auto merge of #13862 - danieleades:logic-bug, r=lnicola
comment out disabled code
This commit is contained in:
commit
674b52aaaa
2 changed files with 1 additions and 27 deletions
|
@ -82,7 +82,6 @@ fn files_are_tidy() {
|
|||
check_dbg(&path, &text);
|
||||
check_test_attrs(&path, &text);
|
||||
check_trailing_ws(&path, &text);
|
||||
deny_clippy(&path, &text);
|
||||
tidy_docs.visit(&path, &text);
|
||||
tidy_marks.visit(&path, &text);
|
||||
}
|
||||
|
@ -144,32 +143,6 @@ fn check_cargo_toml(path: &Path, text: String) {
|
|||
}
|
||||
}
|
||||
|
||||
fn deny_clippy(path: &Path, text: &str) {
|
||||
let ignore = &[
|
||||
// The documentation in string literals may contain anything for its own purposes
|
||||
"ide-db/src/generated/lints.rs",
|
||||
// The tests test clippy lint hovers
|
||||
"ide/src/hover/tests.rs",
|
||||
// The tests test clippy lint completions
|
||||
"ide-completion/src/tests/attribute.rs",
|
||||
];
|
||||
if ignore.iter().any(|p| path.ends_with(p)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if text.contains("\u{61}llow(clippy") {
|
||||
panic!(
|
||||
"\n\nallowing lints is forbidden: {}.
|
||||
rust-analyzer intentionally doesn't check clippy on CI.
|
||||
You can allow lint globally via `xtask clippy`.
|
||||
See https://github.com/rust-lang/rust-clippy/issues/5537 for discussion.
|
||||
|
||||
",
|
||||
path.display()
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "in-rust-tree"))]
|
||||
#[test]
|
||||
fn check_licenses() {
|
||||
|
|
|
@ -48,6 +48,7 @@ impl SyntaxTreeBuilder {
|
|||
pub fn finish(self) -> Parse<SyntaxNode> {
|
||||
let (green, errors) = self.finish_raw();
|
||||
// Disable block validation, see https://github.com/rust-lang/rust-analyzer/pull/10357
|
||||
#[allow(clippy::overly_complex_bool_expr)]
|
||||
if cfg!(debug_assertions) && false {
|
||||
let node = SyntaxNode::new_root(green.clone());
|
||||
crate::validation::validate_block_structure(&node);
|
||||
|
|
Loading…
Reference in a new issue