Version 2.12.0-10.0.dev
Merge commit '2613251b4d331726c14557f8831693c197e0e9a8' into 'dev'
diff --git a/pkg/analyzer/lib/error/error.dart b/pkg/analyzer/lib/error/error.dart
index 0ef80e5..ba3883d 100644
--- a/pkg/analyzer/lib/error/error.dart
+++ b/pkg/analyzer/lib/error/error.dart
@@ -123,7 +123,6 @@
CompileTimeErrorCode.CONST_EVAL_TYPE_NUM,
CompileTimeErrorCode.CONST_EVAL_TYPE_TYPE,
CompileTimeErrorCode.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE,
- CompileTimeErrorCode.CONST_FORMAL_PARAMETER,
CompileTimeErrorCode.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE,
CompileTimeErrorCode
.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE_FROM_DEFERRED_LIBRARY,
diff --git a/pkg/analyzer/lib/src/error/codes.dart b/pkg/analyzer/lib/src/error/codes.dart
index e901de2..d7a5519 100644
--- a/pkg/analyzer/lib/src/error/codes.dart
+++ b/pkg/analyzer/lib/src/error/codes.dart
@@ -1675,15 +1675,6 @@
hasPublishedDocs: true);
/**
- * 6.2 Formal Parameters: It is a compile-time error if a formal parameter is
- * declared as a constant variable.
- */
- static const CompileTimeErrorCode CONST_FORMAL_PARAMETER =
- CompileTimeErrorCode(
- 'CONST_FORMAL_PARAMETER', "Parameters can't be const.",
- correction: "Try removing the 'const' keyword.");
-
- /**
* No parameters.
*/
// #### Description
diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
index 17fee72..98b30f2 100644
--- a/pkg/analyzer/lib/src/generated/error_verifier.dart
+++ b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -637,7 +637,6 @@
@override
void visitFieldFormalParameter(FieldFormalParameter node) {
_checkForValidField(node);
- _checkForConstFormalParameter(node);
_checkForPrivateOptionalParameter(node);
_checkForFieldInitializingFormalRedirectingConstructor(node);
_checkForTypeAnnotationDeferredClass(node.type);
@@ -1107,7 +1106,6 @@
@override
void visitSimpleFormalParameter(SimpleFormalParameter node) {
- _checkForConstFormalParameter(node);
_checkForPrivateOptionalParameter(node);
_checkForTypeAnnotationDeferredClass(node.type);
@@ -2111,16 +2109,6 @@
}
}
- /// Verify that the given normal formal [parameter] is not 'const'.
- ///
- /// See [CompileTimeErrorCode.CONST_FORMAL_PARAMETER].
- void _checkForConstFormalParameter(NormalFormalParameter parameter) {
- if (parameter.isConst) {
- _errorReporter.reportErrorForNode(
- CompileTimeErrorCode.CONST_FORMAL_PARAMETER, parameter);
- }
- }
-
/// Verify that the given instance creation [expression] is not being invoked
/// on an abstract class. The [typeName] is the [TypeName] of the
/// [ConstructorName] from the [InstanceCreationExpression], this is the AST
diff --git a/pkg/analyzer/test/src/diagnostics/const_formal_parameter_test.dart b/pkg/analyzer/test/src/diagnostics/const_formal_parameter_test.dart
deleted file mode 100644
index 79e54ea..0000000
--- a/pkg/analyzer/test/src/diagnostics/const_formal_parameter_test.dart
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-import 'package:analyzer/src/error/codes.dart';
-import 'package:analyzer/src/generated/parser.dart' show ParserErrorCode;
-import 'package:test_reflective_loader/test_reflective_loader.dart';
-
-import '../dart/resolution/context_collection_resolution.dart';
-
-main() {
- defineReflectiveSuite(() {
- defineReflectiveTests(ConstFormalParameterTest);
- });
-}
-
-@reflectiveTest
-class ConstFormalParameterTest extends PubPackageResolutionTest {
- test_fieldFormalParameter() async {
- await assertErrorsInCode(r'''
-class A {
- var x;
- A(const this.x) {}
-}
-''', [
- error(CompileTimeErrorCode.CONST_FORMAL_PARAMETER, 23, 12),
- error(ParserErrorCode.EXTRANEOUS_MODIFIER, 23, 5),
- ]);
- }
-
- test_simpleFormalParameter() async {
- await assertErrorsInCode('''
-f(const x) {}
-''', [
- error(CompileTimeErrorCode.CONST_FORMAL_PARAMETER, 2, 7),
- error(ParserErrorCode.EXTRANEOUS_MODIFIER, 2, 5),
- ]);
- }
-}
diff --git a/pkg/analyzer/test/src/diagnostics/test_all.dart b/pkg/analyzer/test/src/diagnostics/test_all.dart
index 9596f11..3c07bbe 100644
--- a/pkg/analyzer/test/src/diagnostics/test_all.dart
+++ b/pkg/analyzer/test/src/diagnostics/test_all.dart
@@ -86,7 +86,6 @@
import 'const_eval_type_num_test.dart' as const_eval_type_num;
import 'const_field_initializer_not_assignable_test.dart'
as const_field_initializer_not_assignable;
-import 'const_formal_parameter_test.dart' as const_formal_parameter;
import 'const_initialized_with_non_constant_value_from_deferred_library_test.dart'
as const_initialized_with_non_constant_value_from_deferred_library;
import 'const_initialized_with_non_constant_value_test.dart'
@@ -712,7 +711,6 @@
const_eval_type_bool.main();
const_eval_type_num.main();
const_field_initializer_not_assignable.main();
- const_formal_parameter.main();
const_initialized_with_non_constant_value_from_deferred_library.main();
const_initialized_with_non_constant_value.main();
const_instance_field.main();
diff --git a/pkg/vm_service/lib/src/vm_service.dart b/pkg/vm_service/lib/src/vm_service.dart
index 4dfc752..e7ed3a4 100644
--- a/pkg/vm_service/lib/src/vm_service.dart
+++ b/pkg/vm_service/lib/src/vm_service.dart
@@ -6743,7 +6743,7 @@
static Timeline parse(Map<String, dynamic> json) =>
json == null ? null : Timeline._fromJson(json);
- /// A list of timeline events. No order is guarenteed for these events; in
+ /// A list of timeline events. No order is guaranteed for these events; in
/// particular, these events may be unordered with respect to their
/// timestamps.
List<TimelineEvent> traceEvents;
diff --git a/runtime/vm/thread.cc b/runtime/vm/thread.cc
index e6b9b99..9dc2ac5 100644
--- a/runtime/vm/thread.cc
+++ b/runtime/vm/thread.cc
@@ -294,10 +294,6 @@
async_stack_trace_ = stack_trace.raw();
}
-void Thread::set_raw_async_stack_trace(StackTracePtr raw_stack_trace) {
- async_stack_trace_ = raw_stack_trace;
-}
-
void Thread::clear_async_stack_trace() {
async_stack_trace_ = StackTrace::null();
}
diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h
index a4ecadb..9cabac7 100644
--- a/runtime/vm/thread.h
+++ b/runtime/vm/thread.h
@@ -659,7 +659,6 @@
StackTracePtr async_stack_trace() const;
void set_async_stack_trace(const StackTrace& stack_trace);
- void set_raw_async_stack_trace(StackTracePtr raw_stack_trace);
void clear_async_stack_trace();
static intptr_t async_stack_trace_offset() {
return OFFSET_OF(Thread, async_stack_trace_);
diff --git a/tools/VERSION b/tools/VERSION
index bbf4b49..0fe3e77 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 12
PATCH 0
-PRERELEASE 9
+PRERELEASE 10
PRERELEASE_PATCH 0
\ No newline at end of file
