Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Sync from noir #5063

Closed
wants to merge 2 commits into from
Closed

feat: Sync from noir #5063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f95877
chore: add regression test for issue 4449 (https://github.com/noir-la…
AztecBot Mar 7, 2024
663aaa3
git subrepo pull --force --branch=master noir/noir-repo
AztecBot Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion noir/noir-repo/.aztec-sync-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
73d640a4a033f0c865d45da470ef40c1fb03a844
7ff9b71d8d87fc93ae7dbd8ba63f5176b0cd17be
4 changes: 2 additions & 2 deletions noir/noir-repo/.gitrepo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/noir-lang/noir
branch = master
commit = 5f57ebb7ff4b810802f90699a10f4325ef904f2e
parent = 8307dadd853d5091841e169c841ab6b09c223efb
commit = 2a555a041dbd3e40cbf768ca131f508570f4ba50
parent = 5f9587713e33b6184d214f61c4f6136beaae0316
method = merge
cmdver = 0.4.6
9 changes: 0 additions & 9 deletions noir/noir-repo/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions noir/noir-repo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[workspace]

members = [
# Macros crates for metaprogramming
# Aztec Macro crate for metaprogramming
"aztec_macros",
"noirc_macros",
# Compiler crates
"compiler/noirc_evaluator",
"compiler/noirc_frontend",
Expand Down
22 changes: 0 additions & 22 deletions noir/noir-repo/bootstrap.sh
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions noir/noir-repo/bootstrap_cache.sh
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion noir/noir-repo/compiler/noirc_driver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ tracing.workspace = true
thiserror.workspace = true

aztec_macros = { path = "../../aztec_macros" }
noirc_macros = { path = "../../noirc_macros" }
10 changes: 2 additions & 8 deletions noir/noir-repo/compiler/noirc_driver/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,14 +237,8 @@ pub fn check_crate(
deny_warnings: bool,
disable_macros: bool,
) -> CompilationResult<()> {
let macros: Vec<&dyn MacroProcessor> = if disable_macros {
vec![&noirc_macros::AssertMessageMacro as &dyn MacroProcessor]
} else {
vec![
&aztec_macros::AztecMacro as &dyn MacroProcessor,
&noirc_macros::AssertMessageMacro as &dyn MacroProcessor,
]
};
let macros: &[&dyn MacroProcessor] =
if disable_macros { &[] } else { &[&aztec_macros::AztecMacro as &dyn MacroProcessor] };

let mut errors = vec![];
let diagnostics = CrateDefMap::collect_defs(crate_id, context, macros);
Expand Down
Loading
Loading