diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-12-19 09:04:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-19 09:04:38 -0800 |
| commit | 23548c4301e48cb69f05cd01ceba418dc9c36d6c (patch) | |
| tree | 046cc86bd3094174e0c3eab3d8c9ed769aeba2c7 /spec | |
| parent | 6cf2c046efd71ac5f0a1d9a2282259179043af8a (diff) | |
| parent | bde9bf6eb2f6a2d2c0b46f4eb97eec009599b801 (diff) | |
| download | scala-23548c4301e48cb69f05cd01ceba418dc9c36d6c.tar.gz scala-23548c4301e48cb69f05cd01ceba418dc9c36d6c.tar.bz2 scala-23548c4301e48cb69f05cd01ceba418dc9c36d6c.zip | |
Merge pull request #5605 from szeiger/wip/fix-07-links
Fix spec links to `07-implicits.html`
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/04-basic-declarations-and-definitions.md | 4 | ||||
| -rw-r--r-- | spec/12-the-scala-standard-library.md | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/04-basic-declarations-and-definitions.md b/spec/04-basic-declarations-and-definitions.md index 1d908733f2..84459d7639 100644 --- a/spec/04-basic-declarations-and-definitions.md +++ b/spec/04-basic-declarations-and-definitions.md @@ -404,7 +404,7 @@ function definitions. In this section we consider only type parameter definitions with lower bounds `>: $L$` and upper bounds `<: $U$` whereas a discussion of context bounds `: $U$` and view bounds `<% $U$` -is deferred to [here](07-implicit-parameters-and-views.html#context-bounds-and-view-bounds). +is deferred to [here](07-implicits.html#context-bounds-and-view-bounds). The most general form of a first-order type parameter is `$@a_1 \ldots @a_n$ $\pm$ $t$ >: $L$ <: $U$`. @@ -686,7 +686,7 @@ The by-name modifier is disallowed for parameters of classes that carry a `val` or `var` prefix, including parameters of case classes for which a `val` prefix is implicitly generated. The by-name modifier is also disallowed for -[implicit parameters](07-implicit-parameters-and-views.html#implicit-parameters). +[implicit parameters](07-implicits.html#implicit-parameters). ###### Example The declaration diff --git a/spec/12-the-scala-standard-library.md b/spec/12-the-scala-standard-library.md index 8f65191312..c3dc5cf196 100644 --- a/spec/12-the-scala-standard-library.md +++ b/spec/12-the-scala-standard-library.md @@ -141,7 +141,7 @@ Byte - Short whereas `Double` is the highest-ranked. Ranking does _not_ imply a [conformance relationship](03-types.html#conformance); for instance `Int` is not a subtype of `Long`. However, object -[`Predef`](#the-predef-object) defines [views](07-implicit-parameters-and-views.html#views) +[`Predef`](#the-predef-object) defines [views](07-implicits.html#views) from every numeric value type to all higher-ranked numeric value types. Therefore, lower-ranked types are implicitly converted to higher-ranked types when required by the [context](06-expressions.html#implicit-conversions). @@ -467,7 +467,7 @@ val ys: Array[Object] = xs.asInstanceOf[Array[Object]] // OK The instantiation of an array with a polymorphic element type $T$ requires information about type $T$ at runtime. -This information is synthesized by adding a [context bound](07-implicit-parameters-and-views.html#context-bounds-and-view-bounds) +This information is synthesized by adding a [context bound](07-implicits.html#context-bounds-and-view-bounds) of `scala.reflect.ClassTag` to type $T$. An example is the following implementation of method `mkArray`, which creates |