azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverting pull request 240

Browse Source
This commit is contained in:
Andrey Breslav
2013-04-12 15:25:52 +04:00
parent d875bf80cb
commit c422e4194d
73 changed files with 208 additions and 1160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/diagnosticMessage/conflictingSubstitutions1.html
+5 -5
View File
@@ -9,20 +9,20 @@ T</b>
<td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;">
<b>
fun</b>
&lt;T, E : java.lang.Cloneable>
&lt;T, E>
writeToMyList</td>
<td style="white-space:nowrap;font-weight:bold;">
(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
l: MyList&lt;in T&gt;,</td>
l : MyList&lt;in T&gt;,</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
t: T</td>
t : T</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
: jet.Unit <b>
: jet.Unit <b>
where</b>
E : java.io.Closeable</td>
E : java.lang.Cloneable, E : java.io.Closeable</td>
</tr>
<tr>
<td colspan="8" style="white-space:nowrap;">
idea/testData/diagnosticMessage/conflictingSubstitutions2.html
+2 -2
View File
@@ -14,9 +14,9 @@ constructor</b>
<td style="white-space:nowrap;font-weight:bold;">
(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
l: MyList&lt;in T&gt;,</td>
l : MyList&lt;in T&gt;,</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
t: T</td>
t : T</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
idea/testData/diagnosticMessage/functionPlaceholder1.html
+2 -2
View File
@@ -12,11 +12,11 @@ fun</b>
<td style="white-space:nowrap;font-weight:bold;">
(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
a: A&lt;T, R&gt;</td>
a : A&lt;T, R&gt;</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
: A&lt;T, R&gt;</td>
: A&lt;T, R&gt;</td>
</tr>
<tr>
<td colspan="7" style="white-space:nowrap;">
idea/testData/diagnosticMessage/functionPlaceholder2.html
+2 -2
View File
@@ -12,11 +12,11 @@ fun</b>
<td style="white-space:nowrap;font-weight:bold;">
(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
a: A&lt;T, R&gt;</td>
a : A&lt;T, R&gt;</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
: A&lt;T, R&gt;</td>
: A&lt;T, R&gt;</td>
</tr>
<tr>
<td colspan="7" style="white-space:nowrap;">
idea/testData/diagnosticMessage/functionPlaceholder3.html
+2 -2
View File
@@ -12,11 +12,11 @@ fun</b>
<td style="white-space:nowrap;font-weight:bold;">
(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
a: A&lt;T, R&gt;</td>
a : A&lt;T, R&gt;</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
: A&lt;T, R&gt;</td>
: A&lt;T, R&gt;</td>
</tr>
<tr>
<td colspan="7" style="white-space:nowrap;">
idea/testData/diagnosticMessage/upperBoundViolated1.html
+3 -3
View File
@@ -14,13 +14,13 @@ fun</b>
<td style="white-space:nowrap;font-weight:bold;">
(</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
r: R,</td>
r : R,</td>
<td align="right" style="white-space:nowrap;font-weight:bold;">
list: T</td>
list : T</td>
<td style="white-space:nowrap;font-weight:bold;">
)</td>
<td style="white-space:nowrap;font-weight:bold;">
: jet.Unit</td>
: jet.Unit</td>
</tr>
</table>
is not satisfied: inferred type <font color=red>