Skip to content

Commit eadf95b

Browse files
committed
Fix tidy
1 parent 0a26bfb commit eadf95b

3 files changed

Lines changed: 52 additions & 0 deletions

File tree

src/bootstrap/src/utils/proc_macro_deps.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ pub static CRATES: &[&str] = &[
3434
"intl-memoizer",
3535
"intl_pluralrules",
3636
"itoa",
37+
"leb128",
3738
"leb128fmt",
3839
"libc",
3940
"log",
@@ -76,11 +77,14 @@ pub static CRATES: &[&str] = &[
7677
"wasm-encoder",
7778
"wasm-metadata",
7879
"wasmparser",
80+
"wast",
81+
"wiggle-generate",
7982
"winnow",
8083
"wit-bindgen-core",
8184
"wit-bindgen-rust",
8285
"wit-component",
8386
"wit-parser",
87+
"witx",
8488
"yoke",
8589
"zerofrom",
8690
"zerovec",

src/tools/tidy/src/deps.rs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,25 +286,36 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
286286
"adler2",
287287
"aho-corasick",
288288
"allocator-api2", // FIXME: only appears in Cargo.lock due to https://github.com/rust-lang/cargo/issues/10801
289+
"ambient-authority",
290+
"android_system_properties",
289291
"annotate-snippets",
290292
"anstream",
291293
"anstyle",
292294
"anstyle-parse",
293295
"anstyle-query",
294296
"anstyle-wincon",
297+
"anyhow",
295298
"ar_archive_writer",
296299
"arrayref",
297300
"arrayvec",
301+
"async-trait",
298302
"bitflags",
299303
"blake3",
300304
"block-buffer",
301305
"block2",
302306
"bstr",
307+
"bumpalo",
308+
"cap-fs-ext",
309+
"cap-primitives",
310+
"cap-rand",
311+
"cap-std",
312+
"cap-time-ext",
303313
"cc",
304314
"cfg-if",
305315
"cfg_aliases",
306316
"colorchoice",
307317
"constant_time_eq",
318+
"core-foundation-sys",
308319
"cpufeatures",
309320
"crc32fast",
310321
"crossbeam-deque",
@@ -331,19 +342,24 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
331342
"expect-test",
332343
"fallible-iterator", // dependency of `thorin`
333344
"fastrand",
345+
"fd-lock",
334346
"find-msvc-tools",
335347
"flate2",
336348
"fluent-bundle",
337349
"fluent-langneg",
338350
"fluent-syntax",
339351
"fnv",
340352
"foldhash",
353+
"fs-set-times",
341354
"generic-array",
342355
"getopts",
343356
"getrandom",
344357
"gimli",
345358
"gsgdt",
346359
"hashbrown",
360+
"heck",
361+
"iana-time-zone",
362+
"iana-time-zone-haiku",
347363
"icu_collections",
348364
"icu_list",
349365
"icu_locale",
@@ -354,21 +370,28 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
354370
"indexmap",
355371
"intl-memoizer",
356372
"intl_pluralrules",
373+
"io-extras",
374+
"io-lifetimes",
375+
"ipnet",
357376
"is_terminal_polyfill",
358377
"itertools",
359378
"itoa",
360379
"jiff",
361380
"jiff-static",
362381
"jobserver",
382+
"js-sys",
363383
"lazy_static",
364384
"leb128",
385+
"leb128fmt",
365386
"libc",
366387
"libloading",
388+
"libm",
367389
"linux-raw-sys",
368390
"litemap",
369391
"lock_api",
370392
"log",
371393
"matchers",
394+
"maybe-owned",
372395
"md-5",
373396
"measureme",
374397
"memchr",
@@ -417,13 +440,16 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
417440
"rustc-stable-hash",
418441
"rustc_apfloat",
419442
"rustix",
443+
"rustix-linux-procfs",
444+
"rustversion",
420445
"ruzstd", // via object in thorin-dwp
421446
"ryu",
422447
"schemars",
423448
"schemars_derive",
424449
"scoped-tls",
425450
"scopeguard",
426451
"self_cell",
452+
"semver",
427453
"serde",
428454
"serde_core",
429455
"serde_derive",
@@ -436,12 +462,15 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
436462
"shlex",
437463
"simd-adler32",
438464
"smallvec",
465+
"spin",
439466
"stable_deref_trait",
440467
"stacker",
441468
"static_assertions",
469+
"string-interner",
442470
"strsim",
443471
"syn",
444472
"synstructure",
473+
"system-interface",
445474
"tempfile",
446475
"termize",
447476
"thin-vec",
@@ -479,8 +508,24 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
479508
"valuable",
480509
"version_check",
481510
"wasi",
511+
"wasi-common",
512+
"wasm-bindgen",
513+
"wasm-bindgen-macro",
514+
"wasm-bindgen-macro-support",
515+
"wasm-bindgen-shared",
482516
"wasm-encoder",
517+
"wasmi",
518+
"wasmi_collections",
519+
"wasmi_core",
520+
"wasmi_ir",
521+
"wasmi_wasi",
483522
"wasmparser",
523+
"wast",
524+
"wast",
525+
"wat",
526+
"wiggle",
527+
"wiggle-generate",
528+
"wiggle-macro",
484529
"windows",
485530
"windows-collections",
486531
"windows-core",
@@ -502,7 +547,9 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
502547
"windows_x86_64_gnu",
503548
"windows_x86_64_gnullvm",
504549
"windows_x86_64_msvc",
550+
"winx",
505551
"wit-bindgen-rt@0.39.0", // pinned to a specific version due to using a binary blob: <https://github.com/rust-lang/rust/pull/136395#issuecomment-2692769062>
552+
"witx",
506553
"writeable",
507554
"yoke",
508555
"yoke-derive",

src/tools/tidy/src/pal.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ const EXCEPTION_PATHS: &[&str] = &[
4141
"library/windows_link",
4242
"library/panic_abort",
4343
"library/panic_unwind",
44+
"library/proc_macro/src/bridge/client.rs",
4445
"library/unwind",
4546
"library/rtstartup", // Not sure what to do about this. magic stuff for mingw
4647
"library/test", // Probably should defer to unstable `std::sys` APIs.

0 commit comments

Comments
 (0)