Skip to content

Commit d39b4aa

Browse files
authored
Merge pull request #84 from scala/backport-lts-3.3-21915
Backport "doc fix, removed repeated use of the word with" to 3.3 LTS
2 parents 4285003 + a262313 commit d39b4aa

File tree

7 files changed

+6
-7
lines changed

7 files changed

+6
-7
lines changed

.github/workflows/ci.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,6 @@ jobs:
774774
with:
775775
filename: .github/workflows/issue_nightly_failed.md
776776

777-
build-sdk-package:
778777
uses: ./.github/workflows/build-sdk.yml
779778
if:
780779
(github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]')) ||

compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
11431143
* - Every time when generating an ATHROW, a new basic block is started.
11441144
* - During classfile writing, such basic blocks are found to be dead: no branches go there
11451145
* - Eliminating dead code would probably require complex shifts in the output byte buffer
1146-
* - But there's an easy solution: replace all code in the dead block with with
1146+
* - But there's an easy solution: replace all code in the dead block with
11471147
* `nop; nop; ... nop; athrow`, making sure the bytecode size stays the same
11481148
* - The corresponding stack frame can be easily generated: on entering a dead the block,
11491149
* the frame requires a single Throwable on the stack.

compiler/src/dotty/tools/dotc/printing/Printer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ abstract class Printer {
7070
def changePrec(prec: Precedence)(op: => Text): Text =
7171
if (prec < this.prec) atPrec(prec) ("(" ~ op ~ ")") else atPrec(prec)(op)
7272

73-
/** The name, possibly with with namespace suffix if debugNames is set:
73+
/** The name, possibly with namespace suffix if debugNames is set:
7474
* /L for local names, /V for other term names, /T for type names
7575
*/
7676
def nameString(name: Name): String

compiler/src/dotty/tools/dotc/typer/Applications.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ trait Applications extends Compatibility {
12631263
tree
12641264
}
12651265

1266-
/** Is `tp` a unary function type or an overloaded type with with only unary function
1266+
/** Is `tp` a unary function type or an overloaded type with only unary function
12671267
* types as alternatives?
12681268
*/
12691269
def isUnary(tp: Type)(using Context): Boolean = tp match {

tests/pos-with-compiler-cc/backend/jvm/BCodeBodyBuilder.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
11031103
* - Every time when generating an ATHROW, a new basic block is started.
11041104
* - During classfile writing, such basic blocks are found to be dead: no branches go there
11051105
* - Eliminating dead code would probably require complex shifts in the output byte buffer
1106-
* - But there's an easy solution: replace all code in the dead block with with
1106+
* - But there's an easy solution: replace all code in the dead block with
11071107
* `nop; nop; ... nop; athrow`, making sure the bytecode size stays the same
11081108
* - The corresponding stack frame can be easily generated: on entering a dead the block,
11091109
* the frame requires a single Throwable on the stack.

tests/pos-with-compiler-cc/dotc/printing/Printer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ abstract class Printer extends caps.Pure {
7070
def changePrec(prec: Precedence)(op: => Text): Text =
7171
if (prec < this.prec) atPrec(prec) ("(" ~ op ~ ")") else atPrec(prec)(op)
7272

73-
/** The name, possibly with with namespace suffix if debugNames is set:
73+
/** The name, possibly with namespace suffix if debugNames is set:
7474
* /L for local names, /V for other term names, /T for type names
7575
*/
7676
def nameString(name: Name): String

tests/pos-with-compiler-cc/dotc/typer/Applications.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1182,7 +1182,7 @@ trait Applications extends Compatibility {
11821182
tree
11831183
}
11841184

1185-
/** Is `tp` a unary function type or an overloaded type with with only unary function
1185+
/** Is `tp` a unary function type or an overloaded type with only unary function
11861186
* types as alternatives?
11871187
*/
11881188
def isUnary(tp: Type)(using Context): Boolean = tp match {

0 commit comments

Comments
 (0)