merge main

This commit is contained in:
Bryce Miller 2023-06-10 15:04:25 -04:00
commit 0132df9b5a
No known key found for this signature in database
GPG key ID: F1E97BF8DF152350
38 changed files with 6287 additions and 5728 deletions

View file

@ -3847,7 +3847,7 @@ fn load_module<'a>(
"Encode", ModuleId::ENCODE
"Decode", ModuleId::DECODE
"Hash", ModuleId::HASH
"Json", ModuleId::JSON
"TotallyNotJson", ModuleId::JSON
}
let (filename, opt_shorthand) = module_name_to_path(src_dir, &module_name, arc_shorthands);

View file

@ -23,5 +23,5 @@ pub const BUILTIN_MODULES: &[(ModuleId, &str)] = &[
(ModuleId::ENCODE, "Encode"),
(ModuleId::DECODE, "Decode"),
(ModuleId::HASH, "Hash"),
(ModuleId::JSON, "Json"),
(ModuleId::JSON, "TotallyNotJson"),
];