Skip to content

Commit

Permalink
!htc,par cleanup warnings
Browse files Browse the repository at this point in the history
 - about Rendering not being accessible for implementors
 - about DepFn1/2 being defined in package object
  • Loading branch information
jrudolph committed Nov 12, 2014
1 parent 188cbab commit 306c4b8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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._
Expand Down Expand Up @@ -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
}

Expand Down
22 changes: 10 additions & 12 deletions akka-parsing/src/main/scala/akka/shapeless/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 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 binary function type. */
trait DepFn2[T, U] {
type Out
def apply(t: T, u: U): Out
}

0 comments on commit 306c4b8

Please sign in to comment.