8000 Revert "Make -Yrepl-class-based set -Yrepl-use-magic-imports" · scala/scala@4aa17e4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4aa17e4

Browse files
dwijnanddwijnand
committed
Revert "Make -Yrepl-class-based set -Yrepl-use-magic-imports"
This reverts commit c5f1424.
1 parent 1588de1 commit 4aa17e4

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

‎src/compiler/scala/tools/nsc/settings/ScalaSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ trait ScalaSettings extends AbsScalaSettings
236236
val Ymacronoexpand = BooleanSetting ("-Ymacro-no-expand", "Don't expand macros. Might be useful for scaladoc and presentation compiler, but will crash anything which uses macros and gets past typer.") withDeprecationMessage(s"Use ${Ymacroexpand.name}:${MacroExpand.None}") withPostSetHook(_ => Ymacroexpand.value = MacroExpand.None)
237237
val YmacroFresh = BooleanSetting ("-Ymacro-global-fresh-names", "Should fresh names in macros be unique across all compilation units")
238238
val Yreplsync = BooleanSetting ("-Yrepl-sync", "Do not use asynchronous code for repl startup")
239-
val Yreplclassbased = BooleanSetting ("-Yrepl-class-based", "Use classes to wrap REPL snippets instead of objects") withPostSetHook (_ => YreplMagicImport.value = true)
239+
val Yreplclassbased = BooleanSetting ("-Yrepl-class-based", "Use classes to wrap REPL snippets instead of objects")
240240
val YreplMagicImport = BooleanSetting ("-Yrepl-use-magic-imports", "In the code that wraps REPL snippets, use magic imports rather than nesting wrapper object/classes")
241241
val Yreploutdir = StringSetting ("-Yrepl-outdir", "path", "Write repl-generated classfiles to given output directory (use \"\" to generate a temporary dir)" , "")
242242
val YmethodInfer = BooleanSetting ("-Yinfer-argument-types", "Infer types for arguments of overridden methods.")

‎test/files/run/t7747-repl.check

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -251,18 +251,25 @@ sealed class $read extends _root_.java.io.Serializable {
251251
super.<init>;
252252
()
253253
};
254-
import $line44.$read.INSTANCE.$iw.BippyBups;
255-
import $line44.$read.INSTANCE.$iw.BippyBups;
256-
import $line45.$read.INSTANCE.$iw.PuppyPups;
257-
import $line45.$read.INSTANCE.$iw.PuppyPups;
258-
import $line46.$read.INSTANCE.$iw.Bingo;
259-
import $line46.$read.INSTANCE.$iw.Bingo;
260254
sealed class $iw extends _root_.java.io.Serializable {
261255
def <init>() = {
262256
super.<init>;
263257
()
264258
};
265-
val res3 = List(BippyBups, PuppyPups, Bingo)
259+
import $line44.$read.INSTANCE.$iw.$iw.BippyBups;
260+
import $line44.$read.INSTANCE.$iw.$iw.BippyBups;
261+
import $line45.$read.INSTANCE.$iw.$iw.PuppyPups;
262+
import $line45.$read.INSTANCE.$iw.$iw.PuppyPups;
263+
import $line46.$read.INSTANCE.$iw.$iw.Bingo;
264+
import $line46.$read.INSTANCE.$iw.$iw.Bingo;
265+
sealed class $iw extends _root_.java.io.Serializable {
266+
def <init>() = {
267+
super.<init>;
268+
()
269+
};
270+
val res3 = List(BippyBups, PuppyPups, Bingo)
271+
};
272+
val $iw = new $iw.<init>
266273
};
267274
val $iw = new $iw.<init>
268275
}

0 commit comments

Comments
 (0)
0