Merge branch 'dotty-library' of https://github.com/DarkDimius/scala into dotty-library

odersky · odersky · commit 7d572ef738b1 · 2015-12-07T14:35:40.000+01:00
diff --git a/src/library/scala/collection/immutable/Set.scala b/src/library/scala/collection/immutable/Set.scala
@@ -40,7 +40,7 @@ trait Set[A] extends Iterable[A]
   }
   
   override def seq: Set[A] = this
-  protected override def parCombiner = ParSet.newCombiner[A] // if `immutable.SetLike` gets introduced, please move this there!
+  protected[this] override def parCombiner = ParSet.newCombiner[A] // if `immutable.SetLike` gets introduced, please move this there!
 }
 
 /** $factoryInfo

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ trait Set[A] extends Iterable[A]`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`override def seq: Set[A] = this`
`43`		- protected override def parCombiner = ParSet.newCombiner[A] // if `immutable.SetLike` gets introduced, please move this there!
	`43`	+ protected[this] override def parCombiner = ParSet.newCombiner[A] // if `immutable.SetLike` gets introduced, please move this there!
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/** $factoryInfo`