From 00c13fb5a0156fa5cf74661884494484b8fff00e Mon Sep 17 00:00:00 2001 From: Liu Fengyun Date: Mon, 20 Jan 2020 09:39:46 +0100 Subject: [PATCH 1/2] Fix #8015: update docs for vararg patterns --- docs/docs/reference/changed-features/vararg-patterns.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/docs/reference/changed-features/vararg-patterns.md b/docs/docs/reference/changed-features/vararg-patterns.md index 77123d8e6f5e..6dc3946e71f7 100644 --- a/docs/docs/reference/changed-features/vararg-patterns.md +++ b/docs/docs/reference/changed-features/vararg-patterns.md @@ -36,5 +36,8 @@ The change to the grammar is: ## Compatibility considerations -Under the `-language:Scala2Compat` option, Dotty will accept both the old and the new syntax. -A migration warning will be emitted when the old syntax is encountered. +To enable smooth cross compilation between Scala 2 and Scala 3, Dotty will +accept both the old and the new syntax. Under the `-strict` setting, an error +will be emitted when the old syntax is encountered. They will be enabled by +default in version 3.1 of the language. + From faa9ae6504dc1743e7cbc4253235f1ed2305663b Mon Sep 17 00:00:00 2001 From: Liu Fengyun Date: Mon, 20 Jan 2020 09:48:19 +0100 Subject: [PATCH 2/2] Fix #8018: update syntax for wildcard argument in types --- docs/docs/internals/syntax.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/internals/syntax.md b/docs/docs/internals/syntax.md index 3f6470833a08..127a8cc71b51 100644 --- a/docs/docs/internals/syntax.md +++ b/docs/docs/internals/syntax.md @@ -157,7 +157,7 @@ SimpleType ::= SimpleType TypeArgs | StableId | Path ‘.’ ‘type’ SingletonTypeTree(p) | ‘(’ ArgTypes ‘)’ Tuple(ts) - | ‘_’ SubtypeBounds + | ‘?’ SubtypeBounds | Refinement RefinedTypeTree(EmptyTree, refinement) | SimpleLiteral SingletonTypeTree(l) | ‘$’ ‘{’ Block ‘}’