Skip to content

Commit

Permalink
Merge pull request #9056 from dotnet/merges/master-to-feature/witness…
Browse files Browse the repository at this point in the history
…-passing

Merge master to feature/witness-passing
  • Loading branch information
KevinRansom authored Apr 27, 2020
2 parents 937f4b3 + 97a154c commit cceb94e
Show file tree
Hide file tree
Showing 19 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion src/fsharp/FSStrings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<value>Type constraint mismatch. The type \n '{0}' \nis not compatible with type\n '{1}' {2}\n</value>
</data>
<data name="UpperCaseIdentifierInPattern" xml:space="preserve">
<value>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</value>
<value>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</value>
</data>
<data name="NotUpperCaseConstructor" xml:space="preserve">
<value>Discriminated union cases and exception labels must be uppercase identifiers</value>
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">Identifikátory proměnných psané velkými písmeny se ve vzorech obecně nedoporučují. Můžou označovat špatně napsaný název vzoru.</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">Identifikátory proměnných psané velkými písmeny se ve vzorech obecně nedoporučují. Můžou označovat špatně napsaný název vzoru.</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">Variablenbezeichner in Großbuchstaben sollten im Allgemeinen nicht in Mustern verwendet werden und können ein Hinweis auf einen falsch geschriebenen Musternamen sein.</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">Variablenbezeichner in Großbuchstaben sollten im Allgemeinen nicht in Mustern verwendet werden und können ein Hinweis auf einen falsch geschriebenen Musternamen sein.</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">En general, los identificadores de variable en mayúscula no deben usarse en patrones y pueden indicar un nombre de patrón mal escrito.</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">En general, los identificadores de variable en mayúscula no deben usarse en patrones y pueden indicar un nombre de patrón mal escrito.</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">En règle générale, les identificateurs de variable en majuscules ne doivent pas être utilisés dans les modèles. En outre, ils peuvent indiquer une erreur d'orthographe dans le nom du modèle.</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">En règle générale, les identificateurs de variable en majuscules ne doivent pas être utilisés dans les modèles. En outre, ils peuvent indiquer une erreur d'orthographe dans le nom du modèle.</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">In genere non è consigliabile usare identificatori di variabili in lettere maiuscole nei criteri perché potrebbero indicare un nome di criterio con ortografia errata.</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">In genere non è consigliabile usare identificatori di variabili in lettere maiuscole nei criteri perché potrebbero indicare un nome di criterio con ortografia errata.</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">通常、大文字の変数識別子はパターンに使用しません。また、つづりが間違っているパターン名を示す可能性があります。</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">通常、大文字の変数識別子はパターンに使用しません。また、つづりが間違っているパターン名を示す可能性があります。</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">일반적으로 대문자 변수 식별자는 패턴에 사용하지 말아야 합니다. 이러한 식별자는 철자가 잘못된 패턴 이름을 나타낼 수 있습니다.</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">일반적으로 대문자 변수 식별자는 패턴에 사용하지 말아야 합니다. 이러한 식별자는 철자가 잘못된 패턴 이름을 나타낼 수 있습니다.</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">Identyfikatory zmiennych pisane wielkimi literami nie powinny być używane we wzorcach i mogą oznaczać nazwę wzorca z błędami pisowni.</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">Identyfikatory zmiennych pisane wielkimi literami nie powinny być używane we wzorcach i mogą oznaczać nazwę wzorca z błędami pisowni.</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.pt-BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">Identificadores de variáveis maiúsculas geralmente não devem ser usados nos padrões, podendo indicar um nome de padrão escrito incorretamente.</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">Identificadores de variáveis maiúsculas geralmente não devem ser usados nos padrões, podendo indicar um nome de padrão escrito incorretamente.</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">Идентификаторы переменных в верхнем регистре обычно не должны использоваться в шаблонах, и могут указывать на неправильно написанное имя шаблона.</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">Идентификаторы переменных в верхнем регистре обычно не должны использоваться в шаблонах, и могут указывать на неправильно написанное имя шаблона.</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">Büyük harfli değişken tanımlayıcıları desenlerde genel olarak kullanılmamalıdır, yanlış yazılmış bir desen adının göstergesi olabilirler.</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">Büyük harfli değişken tanımlayıcıları desenlerde genel olarak kullanılmamalıdır, yanlış yazılmış bir desen adının göstergesi olabilirler.</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.zh-Hans.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">通常不应在模式中使用大写的变量标识符,这可能标明某个模式名称存在拼写错误。</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">通常不应在模式中使用大写的变量标识符,这可能标明某个模式名称存在拼写错误。</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSStrings.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<note />
</trans-unit>
<trans-unit id="UpperCaseIdentifierInPattern">
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.</source>
<target state="translated">模式中通常不應該使用大寫的變數識別項,這可能表示模式名稱拼字錯誤。</target>
<source>Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.</source>
<target state="needs-review-translation">模式中通常不應該使用大寫的變數識別項,這可能表示模式名稱拼字錯誤。</target>
<note />
</trans-unit>
<trans-unit id="NotUpperCaseConstructor">
Expand Down
12 changes: 6 additions & 6 deletions tests/fsharp/typecheck/sigs/neg07.bsl
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@

neg07.fs(7,10,7,29): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.
neg07.fs(7,10,7,29): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.

neg07.fs(7,10,7,29): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.
neg07.fs(7,10,7,29): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.

neg07.fs(24,13,24,23): typecheck error FS0039: The value or constructor 'UnionCase1' is not defined. Maybe you want one of the following:
X.UnionCase1

neg07.fs(27,11,27,21): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.
neg07.fs(27,11,27,21): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.

neg07.fs(28,11,28,21): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.
neg07.fs(28,11,28,21): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.

neg07.fs(28,11,28,21): typecheck error FS0026: This rule will never be matched

neg07.fs(31,18,31,28): typecheck error FS0039: The value or constructor 'UnionCase1' is not defined. Maybe you want one of the following:
X.UnionCase1

neg07.fs(35,11,35,21): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.
neg07.fs(35,11,35,21): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.

neg07.fs(36,11,36,21): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name.
neg07.fs(36,11,36,21): typecheck error FS0049: Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name.

neg07.fs(36,11,36,21): typecheck error FS0026: This rule will never be matched

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Regression test for DevDiv:305886
// [QueryExpressions] Identifiers for range variables in for-join queries cannot be uppercase!
// We expect a simple warning.
//<Expects status="warning" span="(10,9-10,18)" id="FS0049">Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name\.$</Expects>
//<Expects status="warning" span="(10,9-10,18)" id="FS0049">Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name\.$</Expects>

module M
// Warning
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Regression test for DevDiv:305886
// [QueryExpressions] Identifiers for range variables in for-join queries cannot be uppercase!
// We expect a simple warning.
//<Expects status="warning" span="(10,9-10,18)" id="FS0049">Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name\.$</Expects>
//<Expects status="warning" span="(10,9-10,18)" id="FS0049">Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name\.$</Expects>

module M
// Warning
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Regression test for DevDiv:305886
// [QueryExpressions] Identifiers for range variables in for-join queries cannot be uppercase!
// We expect a simple warning.
//<Expects status="warning" span="(10,9-10,18)" id="FS0049">Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name\.$</Expects>
//<Expects status="warning" span="(10,9-10,18)" id="FS0049">Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name\.$</Expects>

module M
// Warning
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Verify warning when capturing values with captial identifier
// FSB 3954

//<Expects id="FS0049" span="(9,16-9,19)" status="warning">Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name</Expects>
//<Expects id="FS0049" span="(10,16-10,19)" status="warning">Uppercase variable identifiers should not generally be used in patterns, and may indicate a misspelt pattern name</Expects>
//<Expects id="FS0049" span="(9,16-9,19)" status="warning">Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name</Expects>
//<Expects id="FS0049" span="(10,16-10,19)" status="warning">Uppercase variable identifiers should not generally be used in patterns, and may indicate a missing open declaration or a misspelt pattern name</Expects>

let test x = function
| Foo :: [] -> 1
Expand Down

0 comments on commit cceb94e

Please sign in to comment.