mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-30 03:03:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix -M and --dep splitting on every = instead of just the first

Browse Source 
Before this commit, -Mfoo=bar=baz would be incorrectly split into mod_name: `foo` and root_src_orig: `bar`
After this commit, -Mfoo=bar=baz will be correctly split into mod_name: `foo` and root_src_orig: `bar=baz`

Closes #25059
This commit is contained in:
Ryan Liptak 2025-08-28 04:20:35 -07:00 committed by Alex Rønne Petersen
parent dcddbcaa60
commit 76e2764eb1
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.zig
View File

@ -1064,8 +1064,8 @@ fn buildOutputType(
}
} else if (mem.eql(u8, arg, "--dep")) {
var it = mem.splitScalar(u8, args_iter.nextOrFatal(), '=');
const key = it.next().?;
const value = it.next() orelse key;
const key = it.first();
const value = if (it.peek() != null) it.rest() else key;
if (mem.eql(u8, key, "std") and !mem.eql(u8, value, "std")) {
fatal("unable to import as '{s}': conflicts with builtin module", .{
key,
@ -1084,8 +1084,8 @@ fn buildOutputType(
});
} else if (mem.startsWith(u8, arg, "-M")) {
var it = mem.splitScalar(u8, arg["-M".len..], '=');
const mod_name = it.next().?;
const root_src_orig = it.next();
const mod_name = it.first();
const root_src_orig = if (it.peek() != null) it.rest() else null;
try handleModArg(
arena,
mod_name,