diff --git a/xtask/src/builder.rs b/xtask/src/builder.rs index 66f238bde..ca6c586e1 100644 --- a/xtask/src/builder.rs +++ b/xtask/src/builder.rs @@ -203,7 +203,7 @@ impl Builder { /// trim migration code out of the PDDB: when we have a breaking change to the PDDB, /// the PDDB contains code to detect the version change and migrate to the latest /// version. Eventually (on the order of many months or years), this code gets retired, - /// otherwise we accumulate rarely-used code ad nauseum. + /// otherwise we accumulate rarely-used code ad nauseam. #[allow(dead_code)] pub fn set_min_xous_ver<'a>(&'a mut self, min_ver_string: &str) -> &'a mut Builder { self.min_ver = min_ver_string.to_string(); @@ -641,7 +641,7 @@ impl Builder { } } else if self.target.is_none() { // hosted mode doesn't specify a cross-compilation target! - // throw a warning if prebuilts are specified for hosted mode + // throw a warning if prebuilt files are specified for hosted mode for item in [&self.services[..], &self.apps[..]].concat() { match item { CrateSpec::Prebuilt(name, _, _xip) => { diff --git a/xtask/src/verifier.rs b/xtask/src/verifier.rs index e5c599e30..9e70ebfca 100644 --- a/xtask/src/verifier.rs +++ b/xtask/src/verifier.rs @@ -130,7 +130,7 @@ fn compare_dirs(src: &Path, other: &Path) -> Result { This is awful. The Cargo.toml file is parsed and reformatted by the packaging tool to normalize its contents. Thus, the Cargo.toml file of the downloaded version never matches the Cargo.toml file that's actually used. Unfortunately, there doesn't seem to be an easy way to check the equivalence of two Cargo.toml files, - except for recursively and deeply parsing through and comparing all the possibile keys and values of + except for recursively and deeply parsing through and comparing all the possible keys and values of the abstract key/value tree. As a hack, we compare to the Cargo.toml.orig file. Which is...kind of OK, but really, this opens us