raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

!htc,par cleanup warnings

Browse source 
- about Rendering not being accessible for implementors
 - about DepFn1/2 being defined in package object
This commit is contained in:
Johannes Rudolph 2014-11-07 15:28:10 +01:00
parent 188cbabefe
commit 306c4b8e52
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-http-core/src/main/scala/akka/http/model/headers/headers.scala
View file

@ -18,15 +18,15 @@ sealed abstract class ModeledCompanion extends Renderable {
val name = getClass.getSimpleName.replace("$minus", "-").dropRight(1) // trailing $
val lowercaseName = name.toRootLowerCase
private[this] val nameBytes = name.asciiBytes
def render[R <: Rendering](r: R): r.type = r ~~ nameBytes ~~ ':' ~~ ' '
final def render[R <: Rendering](r: R): r.type = r ~~ nameBytes ~~ ':' ~~ ' '
}
sealed trait ModeledHeader extends HttpHeader with Serializable {
def name: String = companion.name
def value: String = renderValue(new StringRendering).get
def lowercaseName: String = companion.lowercaseName
def render[R <: Rendering](r: R): r.type = renderValue(r ~~ companion)
def renderValue[R <: Rendering](r: R): r.type
final def render[R <: Rendering](r: R): r.type = renderValue(r ~~ companion)
protected[http] def renderValue[R <: Rendering](r: R): r.type
protected def companion: ModeledCompanion
}
@ -38,7 +38,7 @@ abstract class CustomHeader extends japi.headers.CustomHeader {
def suppressRendering: Boolean = false
def lowercaseName: String = name.toRootLowerCase
def render[R <: Rendering](r: R): r.type = r ~~ name ~~ ':' ~~ ' ' ~~ value
final def render[R <: Rendering](r: R): r.type = r ~~ name ~~ ':' ~~ ' ' ~~ value
}
import japi.JavaMapping.Implicits._
@ -81,7 +81,7 @@ object Expect extends ModeledCompanion {
val `100-continue` = new Expect() {}
}
sealed abstract case class Expect private () extends ModeledHeader {
def renderValue[R <: Rendering](r: R): r.type = r ~~ "100-continue"
final def renderValue[R <: Rendering](r: R): r.type = r ~~ "100-continue"
protected def companion = Expect
}

24
akka-parsing/src/main/scala/akka/shapeless/package.scala
View file

@ -14,18 +14,16 @@
* limitations under the License.
*/
package akka
package akka.shapeless
package object shapeless {
/** Dependent unary function type. */
trait DepFn1[T] {
type Out
def apply(t: T): Out
}
/** Dependent binary function type. */
trait DepFn2[T, U] {
type Out
def apply(t: T, u: U): Out
}
/** Dependent unary function type. */
trait DepFn1[T] {
type Out
def apply(t: T): Out
}
/** Dependent binary function type. */
trait DepFn2[T, U] {
type Out
def apply(t: T, u: U): Out
}