add nostd checks

Signed-off-by: Oliver Tale-Yazdi <[email protected]>

src/autofix.rs

@@ -9,7 +9,7 @@ use std::{
 	collections::BTreeMap as Map,
 	path::{Path, PathBuf},
 };
-use toml_edit::{table, value, Array, Document, Formatted, InlineTable, Item, Table, Value};
+use toml_edit::{table, value, Array, DocumentMut, Formatted, InlineTable, Item, Table, Value};
 
 #[derive(Debug, clap::Parser)]
 #[cfg_attr(feature = "testing", derive(Default))]
@@ -21,20 +21,20 @@ pub struct AutoFixerArgs {
 
 pub struct AutoFixer {
 	pub manifest: Option<PathBuf>,
-	doc: Option<Document>,
+	doc: Option<DocumentMut>,
 	raw: String,
 }
 
 impl AutoFixer {
 	pub fn from_manifest<P: AsRef<Path>>(manifest: P) -> Result<Self, String> {
 		let raw = std::fs::read_to_string(&manifest)
 			.map_err(|e| format!("Failed to read manifest: {e}"))?;
-		let doc = raw.parse::<Document>().map_err(|e| format!("Failed to parse manifest: {e}"))?;
+		let doc = raw.parse::<DocumentMut>().map_err(|e| format!("Failed to parse manifest: {e}"))?;
 		Ok(Self { raw, manifest: Some(manifest.as_ref().to_path_buf()), doc: Some(doc) })
 	}
 
 	pub fn from_raw(raw: &str) -> Result<Self, String> {
-		let doc = raw.parse::<Document>().map_err(|e| format!("Failed to parse manifest: {e}"))?;
+		let doc = raw.parse::<DocumentMut>().map_err(|e| format!("Failed to parse manifest: {e}"))?;
 		Ok(Self { raw: raw.into(), manifest: None, doc: Some(doc) })
 	}
 
@@ -237,7 +237,7 @@ impl AutoFixer {
 	fn get_all_features(&self) -> Vec<String> {
 		let mut found = Vec::new();
 
-		let doc: &Document = self.doc.as_ref().unwrap();
+		let doc: &DocumentMut = self.doc.as_ref().unwrap();
 		if !doc.contains_table("features") {
 			return found
 		}
@@ -251,7 +251,7 @@ impl AutoFixer {
 	}
 
 	fn get_feature(&self, name: &str) -> Option<&Array> {
-		let doc: &Document = self.doc.as_ref().unwrap();
+		let doc: &DocumentMut = self.doc.as_ref().unwrap();
 		if !doc.contains_table("features") {
 			return None
 		}
@@ -265,7 +265,7 @@ impl AutoFixer {
 	}
 
 	pub(crate) fn get_feature_mut(&mut self, name: &str) -> Result<&mut Array, ()> {
-		let doc: &mut Document = self.doc.as_mut().unwrap();
+		let doc: &mut DocumentMut = self.doc.as_mut().unwrap();
 		if !doc.contains_table("features") {
 			return Err(())
 		}
@@ -358,7 +358,7 @@ impl AutoFixer {
 	}
 
 	pub fn add_feature(&mut self, feature: &str) -> Result<(), String> {
-		let doc: &mut Document = self.doc.as_mut().unwrap();
+		let doc: &mut DocumentMut = self.doc.as_mut().unwrap();
 
 		if !doc.contains_table("features") {
 			doc.as_table_mut().insert("features", table());
@@ -375,7 +375,7 @@ impl AutoFixer {
 
 	/// Add something to a feature. Creates that feature if it does not exist.
 	pub fn add_to_feature(&mut self, feature: &str, v: &str) -> Result<(), String> {
-		let doc: &mut Document = self.doc.as_mut().unwrap();
+		let doc: &mut DocumentMut = self.doc.as_mut().unwrap();
 
 		if !doc.contains_table("features") {
 			doc.as_table_mut().insert("features", table());
@@ -454,7 +454,7 @@ impl AutoFixer {
 		default_feats: Option<bool>,
 	) -> Result<(), String> {
 		let kind = crate::kind_to_str(kind);
-		let doc: &mut Document = self.doc.as_mut().unwrap();
+		let doc: &mut DocumentMut = self.doc.as_mut().unwrap();
 
 		if !doc.contains_table(kind) {
 			return Ok(())
@@ -520,7 +520,7 @@ impl AutoFixer {
 	) -> Result<(), String> {
 		// The carrot is implicit in cargo.
 		let version_str = dep_version.to_string().trim_start_matches('^').to_string();
-		let doc: &mut Document = self.doc.as_mut().unwrap();
+		let doc: &mut DocumentMut = self.doc.as_mut().unwrap();
 
 		if !doc.contains_table("workspace") {
 			return Err("No workspace entry found".into())
@@ -578,7 +578,7 @@ impl AutoFixer {
 	}
 
 	pub fn remove_feature(&mut self, name: &str) {
-		let doc: &mut Document = self.doc.as_mut().unwrap();
+		let doc: &mut DocumentMut = self.doc.as_mut().unwrap();
 
 		if !doc.contains_table("features") {
 			return
@@ -601,6 +601,26 @@ impl AutoFixer {
 		}
 	}
 
+	pub fn disable_default_features(&mut self, dep: &str) -> Result<(), String> {
+		let doc: &mut DocumentMut = self.doc.as_mut().unwrap();
+
+		if !doc.contains_table("dependencies") {
+			return Err("No dependencies entry found".into())
+		}
+
+		let deps = doc["dependencies"].as_table_mut().unwrap();
+		let Some(dep) = deps.get_mut(dep) else {
+			return Err(format!("Dependency '{}' not found", dep))
+		};
+
+		if let Some(dep) = dep.as_inline_table_mut() {
+			dep.insert("default-features", Value::Boolean(Formatted::new(false)));
+			Ok(())
+		} else {
+			Err(format!("Dependency '{}' is not an inline table", dep))
+		}
+	}
+
 	pub fn modified(&self) -> bool {
 		self.doc.as_ref().unwrap().to_string() != self.raw
 	}

src/cmd/lint/nostd.rs

@@ -1,8 +1,11 @@
 use std::collections::BTreeMap;
-use crate::cmd::CargoArgs;
+use crate::cmd::{lint::AutoFixer, CargoArgs};
 use crate::cmd::GlobalArgs;
 use cargo_metadata::{DependencyKind, Package};
 use crate::cmd::resolve_dep;
+use crate::grammar::plural;
+use std::collections::btree_map::Entry;
+use std::fs::canonicalize;
 
 #[derive(Debug, clap::Parser)]
 pub struct NoStdCmd {
@@ -22,6 +25,10 @@ pub struct DefaultFeaturesDisabledCmd {
 	#[allow(missing_docs)]
 	#[clap(flatten)]
 	cargo_args: CargoArgs,
+
+	/// Whether to fix the issues.
+	#[clap(long, short)]
+	fix: bool,
 }
 
 impl NoStdCmd {
@@ -35,9 +42,12 @@ impl NoStdCmd {
 impl DefaultFeaturesDisabledCmd {
 	pub(crate) fn run(&self, _: &GlobalArgs) -> Result<(), String> {
 		let meta = self.cargo_args.clone().with_workspace(true).load_metadata()?;
-		//let dag = build_feature_dag(&meta, &meta.packages);
 		let pkgs = &meta.packages;
 		let mut cache = BTreeMap::new();
+		let mut autofixer = BTreeMap::new();
+		let mut issues = 0;
+		// Dir that we are allowed to write to.
+		let allowed_dir = canonicalize(meta.workspace_root.as_std_path()).unwrap();
 
 		for lhs in pkgs.iter() {
 			// check if lhs supports no-std builds
@@ -58,12 +68,40 @@ impl DefaultFeaturesDisabledCmd {
 					continue;
 				}
 
-				if dep.uses_default_features {
-					log::warn!("{} depends on {} with default features", lhs.name, rhs.pkg.name);
+				if !dep.uses_default_features {
+					continue;
 				}
+
+				println!("Default features not disabled for dependency: {} -> {}", lhs.name, rhs.pkg.name);
+
+				let fixer = match autofixer.entry(lhs.manifest_path.clone()) {
+					Entry::Occupied(e) => e.into_mut(),
+					Entry::Vacant(e) => {
+						let krate_path = canonicalize(lhs.manifest_path.clone().into_std_path_buf()).unwrap();
+
+						if !krate_path.starts_with(&allowed_dir) {
+							return Err(format!("Cannot write to path: {}", krate_path.display()))
+						}
+						e.insert(AutoFixer::from_manifest(&lhs.manifest_path)?)
+					},
+				};
+
+				fixer.disable_default_features(&rhs.name())?;
+				issues += 1;
 			}
 		}
 
+		let s = plural(autofixer.len());
+		print!("Found {} issue{} in {} crate{s} ", issues, plural(issues),  autofixer.len());
+		if self.fix {
+			for (_, fixer) in autofixer.iter_mut() {
+				fixer.save()?;
+			}
+			println!("and fixed all of them.");
+		} else {
+			println!("and fixed none. Re-run with --fix to apply fixes.");
+		}
+
 		Ok(())
 	}