]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #103958 - chenyukang:yukang/fix-103951-count-limit, r=jyn514
authorMatthias Krüger <matthias.krueger@famsik.de>
Fri, 4 Nov 2022 17:52:28 +0000 (18:52 +0100)
committerGitHub <noreply@github.com>
Fri, 4 Nov 2022 17:52:28 +0000 (18:52 +0100)
Test tidy should not count untracked paths towards entries limit

Fixes #103951
r? `@jyn514`

1  2 
Cargo.lock
src/tools/tidy/Cargo.toml
src/tools/tidy/src/ui_tests.rs

diff --cc Cargo.lock
index 075c5d4404621ae0dd48caa576d0f60d79047248,cea17ecc3d4098a0e026cc56dec6d9f3f0de343e..b73a4d6f2da50c81ba6d90cde0b596ce3c8ea3a6
@@@ -4937,8 -4919,8 +4937,9 @@@ name = "tidy
  version = "0.1.0"
  dependencies = [
   "cargo_metadata 0.14.0",
+  "ignore",
   "lazy_static",
 + "miropt-test-tools",
   "regex",
   "walkdir",
  ]
index 774c97b7777d2c7467b2bf9aac4b9295346aecd9,8a6fbaecd6980efbd6cd3fe07d69638abf57cbf0..97d038da702d5b727497f787702ad559fe87def8
@@@ -7,9 -7,9 +7,10 @@@ autobins = fals
  [dependencies]
  cargo_metadata = "0.14"
  regex = "1"
 +miropt-test-tools = { path = "../miropt-test-tools" }
  lazy_static = "1"
  walkdir = "2"
+ ignore = "0.4.18"
  
  [[bin]]
  name = "rust-tidy"
Simple merge