Merge branch 'master' into tf/yarn-caching

* master: fix: failing js tests (#2722) chore: Add deprecation message for default type in for loop (#2689)
noir-lang · Sep 15, 2023 · cd82505 · cd82505
2 parents b465812 + 398b6d7
commit cd82505
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 8 deletions.
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -80,8 +80,13 @@ jobs:
       - name: Install Yarn dependencies
         uses: ./.github/actions/setup
 
+      - name: Setup `integration-tests`
+        run: |
+          yarn workspace @noir-lang/noir-source-resolver build
+
       - name: Run `integration-tests`
-        run: yarn test:integration
+        run: |
+          yarn test:integration
           
       - name: Alert on nightly test failure  
         uses: JasonEtco/create-an-issue@v2

diff --git a/compiler/integration-tests/package.json b/compiler/integration-tests/package.json
@@ -18,7 +18,6 @@
     "@noir-lang/source-resolver": "workspace:*",
     "@web/dev-server-esbuild": "^0.3.6",
     "@web/test-runner": "^0.15.3",
-    "@web/test-runner-playwright": "^0.10.0",
     "@web/test-runner-webdriver": "^0.7.0",
     "fflate": "^0.8.0",
     "smol-toml": "^1.1.2"

diff --git a/compiler/noirc_frontend/src/hir/type_check/mod.rs b/compiler/noirc_frontend/src/hir/type_check/mod.rs
@@ -332,7 +332,14 @@ mod test {
 
         "#;
 
-        type_check_src_code(src, vec![String::from("main"), String::from("foo")]);
+        // expect a deprecation warning since we are changing for-loop default type.
+        // There is a deprecation warning per for-loop.
+        let expected_num_errors = 2;
+        type_check_src_code_errors_expected(
+            src,
+            expected_num_errors,
+            vec![String::from("main"), String::from("foo")],
+        );
     }
     #[test]
     fn basic_closure() {
@@ -389,15 +396,27 @@ mod test {
         }
     }
 
+    fn type_check_src_code(src: &str, func_namespace: Vec<String>) {
+        type_check_src_code_errors_expected(src, 0, func_namespace)
+    }
     // This function assumes that there is only one function and this is the
     // func id that is returned
-    fn type_check_src_code(src: &str, func_namespace: Vec<String>) {
+    fn type_check_src_code_errors_expected(
+        src: &str,
+        expected_number_errors: usize,
+        func_namespace: Vec<String>,
+    ) {
         let (program, errors) = parse_program(src);
         let mut interner = NodeInterner::default();
 
-        // Using assert_eq here instead of assert(errors.is_empty()) displays
-        // the whole vec if the assert fails rather than just two booleans
-        assert_eq!(errors, vec![]);
+        assert_eq!(
+            errors.len(),
+            expected_number_errors,
+            "expected {} errors, but got {}, errors: {:?}",
+            expected_number_errors,
+            errors.len(),
+            errors
+        );
 
         let main_id = interner.push_fn(HirFunction::empty());
         interner.push_function_definition("main".into(), main_id);

diff --git a/compiler/noirc_frontend/src/parser/errors.rs b/compiler/noirc_frontend/src/parser/errors.rs
@@ -27,6 +27,8 @@ pub enum ParserErrorReason {
     PatternInTraitFunctionParameter,
     #[error("comptime keyword is deprecated")]
     ComptimeDeprecated,
+    #[error("the default type of a for-loop range will be changing from a Field to a u64")]
+    ForLoopDefaultTypeChanging,
     #[error("{0} are experimental and aren't fully supported yet")]
     ExperimentalFeature(&'static str),
     #[error("Where clauses are allowed only on functions with generic parameters")]
@@ -132,6 +134,11 @@ impl From<ParserError> for Diagnostic {
                         "The 'comptime' keyword has been deprecated. It can be removed without affecting your program".into(),
                         error.span,
                     ),
+                    ParserErrorReason::ForLoopDefaultTypeChanging => Diagnostic::simple_warning(
+                        "The default type for the incrementor in a for-loop will be changed.".into(),
+                        "The default type in a for-loop will be changing from Field to u64".into(),
+                        error.span,
+                    ),
                     ParserErrorReason::ExperimentalFeature(_) => Diagnostic::simple_warning(
                         reason.to_string(),
                         "".into(),

diff --git a/compiler/noirc_frontend/src/parser/parser.rs b/compiler/noirc_frontend/src/parser/parser.rs
@@ -1384,6 +1384,10 @@ where
         .then(expr_no_constructors.clone())
         .map(|(start, end)| ForRange::Range(start, end))
         .or(expr_no_constructors.map(ForRange::Array))
+        .validate(|expr, span, emit| {
+            emit(ParserError::with_reason(ParserErrorReason::ForLoopDefaultTypeChanging, span));
+            expr
+        })
 }
 
 fn array_expr<P>(expr_parser: P) -> impl NoirParser<ExpressionKind>

diff --git a/yarn.lock b/yarn.lock
@@ -4295,7 +4295,6 @@ __metadata:
     "@noir-lang/source-resolver": "workspace:*"
     "@web/dev-server-esbuild": ^0.3.6
     "@web/test-runner": ^0.15.3
-    "@web/test-runner-playwright": ^0.10.0
     "@web/test-runner-webdriver": ^0.7.0
     fflate: ^0.8.0
     smol-toml: ^1.1.2