mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #113275 - Nilstrieb:perm, r=fee1-dead

Browse Source 
link to PERMITTED_DEPENDENCIES in tidy error
This commit is contained in:
bors 2023-07-03 12:24:14 +00:00
commit f798ada7ba
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/tidy/src/deps.rs
View File

@ -99,6 +99,8 @@
/// these and all their dependencies *must not* be in the exception list. /// these and all their dependencies *must not* be in the exception list.
const RUNTIME_CRATES: &[&str] = &["std", "core", "alloc", "test", "panic_abort", "panic_unwind"]; const RUNTIME_CRATES: &[&str] = &["std", "core", "alloc", "test", "panic_abort", "panic_unwind"];
const PERMITTED_DEPS_LOCATION: &str = concat!(file!(), ":", line!());
/// Crates rustc is allowed to depend on. Avoid adding to the list if possible. /// Crates rustc is allowed to depend on. Avoid adding to the list if possible.
/// ///
/// This list is here to provide a speed-bump to adding a new dependency to /// This list is here to provide a speed-bump to adding a new dependency to
@ -500,6 +502,7 @@ fn check_permitted_dependencies(
restricted_dependency_crates: &[&'static str], restricted_dependency_crates: &[&'static str],
bad: &mut bool, bad: &mut bool,
) { ) {
let mut has_permitted_dep_error = false;
let mut deps = HashSet::new(); let mut deps = HashSet::new();
for to_check in restricted_dependency_crates { for to_check in restricted_dependency_crates {
let to_check = pkg_from_name(metadata, to_check); let to_check = pkg_from_name(metadata, to_check);
@ -534,6 +537,7 @@ fn check_permitted_dependencies(
"could not find allowed package `{permitted}`\n\ "could not find allowed package `{permitted}`\n\
Remove from PERMITTED_DEPENDENCIES list if it is no longer used.", Remove from PERMITTED_DEPENDENCIES list if it is no longer used.",
); );
has_permitted_dep_error = true;
} }
} }
@ -546,9 +550,14 @@ fn check_permitted_dependencies(
if dep.source.is_some() { if dep.source.is_some() {
if !permitted_dependencies.contains(dep.name.as_str()) { if !permitted_dependencies.contains(dep.name.as_str()) {
tidy_error!(bad, "Dependency for {descr} not explicitly permitted: {}", dep.id); tidy_error!(bad, "Dependency for {descr} not explicitly permitted: {}", dep.id);
has_permitted_dep_error = true;
} }
} }
} }
if has_permitted_dep_error {
eprintln!("Go to `{PERMITTED_DEPS_LOCATION}` for the list.");
}
} }
/// Finds a package with the given name. /// Finds a package with the given name.