Avoid re-allocating allconfigs_path in determineAllConfigs.

Fork: 0

johnpearcey / dub_jkp

Browse code Avoid re-allocating allconfigs_path in determineAllConfigs. master
1 parent cd2a4dc commit e6e1b18fa3953f0faf6c66f993b705191d5b78b4 Sönke Ludwig authored on 3 May

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          8 ■■■■■
          source/dub/project.d
 			auto idx = allconfigs_path.countUntil(pname);
			enforce(idx < 0, format("Detected dependency cycle: %s", (allconfigs_path[idx .. $] ~ pname).join("->")));
			allconfigs_path ~= pname;
			scope (exit) allconfigs_path.length--;
			scope (exit) {
				allconfigs_path.length--;
				allconfigs_path.assumeSafeAppend;
			}
 
			// first, add all dependency configurations
			foreach (d; pdeps) {
				auto dp = package_map.get(d.name.toString(), rebindable(const(Package).init));
 			auto idx = allconfigs_path.countUntil(pname);
 			enforce(idx < 0, format("Detected dependency cycle: %s", (allconfigs_path[idx .. $] ~ pname).join("->")));
 			allconfigs_path ~= pname;
+			scope (exit) allconfigs_path.length--;
+			scope (exit) {
+				allconfigs_path.length--;
+				allconfigs_path.assumeSafeAppend;
+			}
 			// first, add all dependency configurations
 			foreach (d; pdeps) {
 				auto dp = package_map.get(d.name.toString(), rebindable(const(Package).init));

Show line notes below