{"header":{"message":"Fix assets builder misses crate root for build-plan (#338)","description":null,"timestamp":"2024-05-04T13:34:16Z","authors":[{"email":"a@koz.email","name":"Alexander Koz"}]},"hash":"IWUENYYKBCEWZ6TNFEKDRVVLI54R5BSIWC2F645DZP4VE7S2YM4QC","authors":[],"deps":{"hashes":[["IWUENYYKBCEWZ6TNFEKDRVVLI54R5BSIWC2F645DZP4VE7S2YM4QC","Fix assets builder misses crate root for build-plan (#338)"],["AA",null],["N37SUM4JCJBPJ47YSITTXZNT3HDOA4I7J23UNY57LHJPPVEZSBZQC","Initial import (history reset)"],["PHQDMUDW27DANDC2MSBMO62NF5M5DBMZDK5VCWKPEZSBPQI7IDIQC","Dev-assets support (#106)"],["OKZSE5GFCSSJJKQLQSPXBLUTVZMUDWUBICMB3PU5QS6UHJIBFUVAC","add option to skip assets pre-build step"],["U74W343C7NX46YBDZ3UPNGBQJLGYVQSAV4GFRMZHHL2T4DDDOPKAC","Support crates minor refactoring: optimisations & clean garbage, update deps"],["3QY74JF5IQEM5N53R6TGO2L7O4RVCWJ7T6WYP7KJO6RRKOD74R3AC","Update deps, fix breaking changes of deps, bump versions, fix rust toolchain channel."]],"deps":["N37SUM4JCJBPJ47YSITTXZNT3HDOA4I7J23UNY57LHJPPVEZSBZQC","PHQDMUDW27DANDC2MSBMO62NF5M5DBMZDK5VCWKPEZSBPQI7IDIQC","OKZSE5GFCSSJJKQLQSPXBLUTVZMUDWUBICMB3PU5QS6UHJIBFUVAC","U74W343C7NX46YBDZ3UPNGBQJLGYVQSAV4GFRMZHHL2T4DDDOPKAC"],"known":["3QY74JF5IQEM5N53R6TGO2L7O4RVCWJ7T6WYP7KJO6RRKOD74R3AC"]},"hunks":[{"Replacement":{"inode":{"change":2,"pos":136706},"path":"support/build/src/assets/plan.rs","line":92,"ins":{"up_context":[{"change":2,"pos":139662}],"down_context":[{"change":2,"pos":139716}],"flag":"BLOCK","start":74,"end":237,"inode":{"change":2,"pos":136706}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":139662},"to":{"change":2,"start":139662,"end":139716},"introduced_by":2}],"inode":{"change":2,"pos":136706}},"ins_contents":[{"Add":"\t\tlet source_exists = {"},{"Add":"\t\t\tlet p = Path::new(value);"},{"Add":"\t\t\tp.is_absolute()"},{"Add":"\t\t\t .then(|| p.try_exists())"},{"Add":"\t\t\t .unwrap_or_else(|| crate_root.join(p).try_exists())?"},{"Add":"\t\t};"}],"del_contents":[{"Del":"\t\tlet source_exists = Path::new(value).try_exists()?;\n"}]}},{"Edit":{"inode":{"change":2,"pos":136706},"path":"support/build/src/assets/plan.rs","line":194,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":143216}],"down_context":[{"change":2,"pos":143216}],"flag":"BLOCK","start":238,"end":763,"inode":{"change":2,"pos":136706}}},"contents":[{"Add":"}"},{"Add":""},{"Add":""},{"Add":"/// Make path relative to `crate_root` if it isn't absolute, checking existence."},{"Add":"/// Returns `None` if path doesn't exist."},{"Add":"pub fn existing_abs_rel_to_crate_root<'t, P1, P2>(p: P1, root: P2) -> std::io::Result>>"},{"Add":"\twhere P1: 't + AsRef + Into>,"},{"Add":"\t P2: AsRef {"},{"Add":"\tlet p = if p.as_ref().is_absolute() && p.as_ref().try_exists()? {"},{"Add":"\t\tSome(p.into())"},{"Add":"\t} else {"},{"Add":"\t\tlet abs = root.as_ref().join(p);"},{"Add":"\t\tif abs.try_exists()? {"},{"Add":"\t\t\tSome(Cow::Owned(abs))"},{"Add":"\t\t} else {"},{"Add":"\t\t\tNone"},{"Add":"\t\t}"},{"Add":"\t};"},{"Add":"\tOk(p)"}]}},{"Replacement":{"inode":{"change":2,"pos":136706},"path":"support/build/src/assets/plan.rs","line":309,"ins":{"up_context":[{"change":2,"pos":146869}],"down_context":[{"change":5,"pos":6208}],"flag":"BLOCK","start":764,"end":786,"inode":{"change":2,"pos":136706}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":146869},"to":{"change":5,"start":6178,"end":6208},"introduced_by":5}],"inode":{"change":2,"pos":136706}},"ins_contents":[{"Add":"\tpub fn iter_flatten("}],"del_contents":[{"Del":"\tpub fn serializable_flatten(\n"}]}},{"Replacement":{"inode":{"change":2,"pos":136706},"path":"support/build/src/assets/plan.rs","line":311,"ins":{"up_context":[{"change":5,"pos":6217}],"down_context":[{"change":2,"pos":147086}],"flag":"BLOCK","start":787,"end":1019,"inode":{"change":2,"pos":136706}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":6217},"to":{"change":5,"start":6217,"end":6303},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":6303},"to":{"change":2,"start":147001,"end":147086},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":147001},"to":{"change":2,"start":147001,"end":147086},"introduced_by":2}],"inode":{"change":2,"pos":136706}},"ins_contents":[{"Add":"\t\t-> impl Iterator))> + '_ {"},{"Add":"\t\tlet pair = |inc: &Match| {"},{"Add":"\t\t\t(inc.target().to_path_buf(), abs_or_rel_crate_any(inc.source(), self.crate_root).to_path_buf())"},{"Add":"\t\t};"}],"del_contents":[{"Del":"\t\t-> impl Iterator))> + '_ {\n"},{"Del":"\t\tlet pair = |inc: &Match| (inc.target().to_path_buf(), inc.source().to_path_buf());\n"}]}},{"Replacement":{"inode":{"change":2,"pos":149627},"path":"support/build/src/assets/mod.rs","line":124,"ins":{"up_context":[{"change":2,"pos":154247}],"down_context":[{"change":2,"pos":154357}],"flag":"BLOCK","start":1021,"end":1272,"inode":{"change":2,"pos":149627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":154247},"to":{"change":2,"start":154247,"end":154357},"introduced_by":2}],"inode":{"change":2,"pos":149627}},"ins_contents":[{"Add":"\tlet (mut plan, crate_root) = plan.into_parts();"},{"Add":"\t// let mut results = HashMap::with_capacity(plan.as_inner().len());"},{"Add":"\tlet mut results = HashMap::with_capacity(plan.len());"},{"Add":"\t// for entry in plan.into_inner().drain(..) {"},{"Add":"\tfor entry in plan.drain(..) {"}],"del_contents":[{"Del":"\tlet mut results = HashMap::with_capacity(plan.as_inner().len());\n\tfor entry in plan.into_inner().drain(..) {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":149627},"path":"support/build/src/assets/mod.rs","line":130,"ins":{"up_context":[{"change":2,"pos":154396}],"down_context":[{"change":2,"pos":154555}],"flag":"BLOCK","start":1273,"end":1572,"inode":{"change":2,"pos":149627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":154396},"to":{"change":2,"start":154396,"end":154555},"introduced_by":2}],"inode":{"change":2,"pos":149627}},"ins_contents":[{"Add":"\t\t\tMapping::AsIs(inc, ..) => {"},{"Add":"\t\t\t\tlet source = abs_or_rel_crate_any(inc.source(), crate_root);"},{"Add":"\t\t\t\tvec![method(&source, &inc.target(), false)]"},{"Add":"\t\t\t},"},{"Add":"\t\t\tMapping::Into(inc, ..) => {"},{"Add":"\t\t\t\tlet source = abs_or_rel_crate_any(inc.source(), crate_root);"},{"Add":"\t\t\t\tvec![method(&source, &inc.target(), true)]"},{"Add":"\t\t\t},"}],"del_contents":[{"Del":"\t\t\tMapping::AsIs(inc, ..) => vec![method(&inc.source(), &inc.target(), false)],\n\t\t\tMapping::Into(inc, ..) => vec![method(&inc.source(), &inc.target(), true)],\n"}]}},{"Replacement":{"inode":{"change":2,"pos":149627},"path":"support/build/src/assets/mod.rs","line":140,"ins":{"up_context":[{"change":2,"pos":154624}],"down_context":[{"change":2,"pos":154689}],"flag":"BLOCK","start":1573,"end":1672,"inode":{"change":2,"pos":149627}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":154624},"to":{"change":2,"start":154624,"end":154689},"introduced_by":2}],"inode":{"change":2,"pos":149627}},"ins_contents":[{"Add":"\t\t\t\t .map(|inc| (abs_or_rel_crate_any(inc.source(), crate_root), target.join(inc.target())))"}],"del_contents":[{"Del":"\t\t\t\t .map(|inc| (inc.source(), target.join(inc.target())))\n"}]}},{"Edit":{"inode":{"change":2,"pos":430068},"path":"cargo/src/assets/mod.rs","line":217,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":12187}],"down_context":[{"change":4,"pos":1200}],"flag":"BLOCK","start":1814,"end":1882,"inode":{"change":2,"pos":430068}}},"contents":[{"Add":""},{"Add":"\t\t\t\t\tlet dep_root = dependency.manifest_path().parent().unwrap();"},{"Add":""}]}},{"Replacement":{"inode":{"change":2,"pos":430068},"path":"cargo/src/assets/mod.rs","line":223,"ins":{"up_context":[{"change":3,"pos":12350}],"down_context":[{"change":3,"pos":12484}],"flag":"BLOCK","start":1883,"end":2419,"inode":{"change":2,"pos":430068}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12350},"to":{"change":3,"start":12350,"end":12484},"introduced_by":3}],"inode":{"change":2,"pos":430068}},"ins_contents":[{"Add":"\t\t\t\t\t\t let dest = format!(\"destination: {}\", dest.as_relative_to_root(config).display());"},{"Add":"\t\t\t\t\t\t log.status(\"\", dest);"},{"Add":"\t\t\t\t\t\t let src = format!(\"root {}\", dep_root.as_relative_to_root(config).display());"},{"Add":"\t\t\t\t\t\t log.status(\"\", src);"},{"Add":"\t\t\t\t\t\t if dep_root != &plan.path {"},{"Add":"\t\t\t\t\t\t\t let path = plan.plan.crate_root();"},{"Add":"\t\t\t\t\t\t\t let src = format!(\"root (plan) {}\", path.as_relative_to_root(config).display());"},{"Add":"\t\t\t\t\t\t\t log.status(\"\", src);"},{"Add":"\t\t\t\t\t\t }"}],"del_contents":[{"Del":"\t\t\t\t\t\t let s = format!(\"destination: {}\", dest.as_relative_to_root(config).display());\n\t\t\t\t\t\t log.status(\"\", s)\n"}]}}],"owner":"fzzr","repo":"playdate","token":"VH8Ky4f3RPgAZnzXdEiRzS91gZ7P7Nb3+dGysR1VIk0=","login":null}

…

Dependencies

Change contents