Skip to content

Backport "doc fix, removed repeated use of the word with" to 3.3 LTS #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,6 @@ jobs:
with:
filename: .github/workflows/issue_nightly_failed.md

build-sdk-package:
uses: ./.github/workflows/build-sdk.yml
if:
(github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]')) ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
* - Every time when generating an ATHROW, a new basic block is started.
* - During classfile writing, such basic blocks are found to be dead: no branches go there
* - Eliminating dead code would probably require complex shifts in the output byte buffer
* - But there's an easy solution: replace all code in the dead block with with
* - But there's an easy solution: replace all code in the dead block with
* `nop; nop; ... nop; athrow`, making sure the bytecode size stays the same
* - The corresponding stack frame can be easily generated: on entering a dead the block,
* the frame requires a single Throwable on the stack.
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/printing/Printer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ abstract class Printer {
def changePrec(prec: Precedence)(op: => Text): Text =
if (prec < this.prec) atPrec(prec) ("(" ~ op ~ ")") else atPrec(prec)(op)

/** The name, possibly with with namespace suffix if debugNames is set:
/** The name, possibly with namespace suffix if debugNames is set:
* /L for local names, /V for other term names, /T for type names
*/
def nameString(name: Name): String
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/typer/Applications.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,7 @@ trait Applications extends Compatibility {
tree
}

/** Is `tp` a unary function type or an overloaded type with with only unary function
/** Is `tp` a unary function type or an overloaded type with only unary function
* types as alternatives?
*/
def isUnary(tp: Type)(using Context): Boolean = tp match {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
* - Every time when generating an ATHROW, a new basic block is started.
* - During classfile writing, such basic blocks are found to be dead: no branches go there
* - Eliminating dead code would probably require complex shifts in the output byte buffer
* - But there's an easy solution: replace all code in the dead block with with
* - But there's an easy solution: replace all code in the dead block with
* `nop; nop; ... nop; athrow`, making sure the bytecode size stays the same
* - The corresponding stack frame can be easily generated: on entering a dead the block,
* the frame requires a single Throwable on the stack.
Expand Down
2 changes: 1 addition & 1 deletion tests/pos-with-compiler-cc/dotc/printing/Printer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ abstract class Printer extends caps.Pure {
def changePrec(prec: Precedence)(op: => Text): Text =
if (prec < this.prec) atPrec(prec) ("(" ~ op ~ ")") else atPrec(prec)(op)

/** The name, possibly with with namespace suffix if debugNames is set:
/** The name, possibly with namespace suffix if debugNames is set:
* /L for local names, /V for other term names, /T for type names
*/
def nameString(name: Name): String
Expand Down
2 changes: 1 addition & 1 deletion tests/pos-with-compiler-cc/dotc/typer/Applications.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1182,7 +1182,7 @@ trait Applications extends Compatibility {
tree
}

/** Is `tp` a unary function type or an overloaded type with with only unary function
/** Is `tp` a unary function type or an overloaded type with only unary function
* types as alternatives?
*/
def isUnary(tp: Type)(using Context): Boolean = tp match {
Expand Down