diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2015-04-28 16:12:29 +0200 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2015-04-28 16:12:32 +0200 |
| commit | 9a397c676d0b1ba3119623cc4332e3ff5c21accf (patch) | |
| tree | e6ec584727a862a343b8eb6203f97be94898e8df | |
| parent | eeba018f27487e161de93d93c01cb8b2d8132f8f (diff) | |
| download | scala-9a397c676d0b1ba3119623cc4332e3ff5c21accf.tar.gz scala-9a397c676d0b1ba3119623cc4332e3ff5c21accf.tar.bz2 scala-9a397c676d0b1ba3119623cc4332e3ff5c21accf.zip | |
spec: Remove obsolete rules related to scala.NotNull
These rules were removed in #2244 and scala.NotNull itself was
deprecated.
| -rw-r--r-- | spec/03-types.md | 3 | ||||
| -rw-r--r-- | spec/06-expressions.md | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/spec/03-types.md b/spec/03-types.md index 9741286a5d..94b7916634 100644 --- a/spec/03-types.md +++ b/spec/03-types.md @@ -835,8 +835,7 @@ transitive relation that satisfies the following conditions. - For every type constructor $T$ (with any number of type parameters), `scala.Nothing <: $T$ <: scala.Any`. -- For every class type $T$ such that `$T$ <: scala.AnyRef` and not - `$T$ <: scala.NotNull` one has `scala.Null <: $T$`. +- For every class type $T$ such that `$T$ <: scala.AnyRef` one has `scala.Null <: $T$`. - A type variable or abstract type $t$ conforms to its upper bound and its lower bound conforms to $t$. - A class type or parameterized type conforms to any of its base-types. diff --git a/spec/06-expressions.md b/spec/06-expressions.md index db206631a8..da9e21f267 100644 --- a/spec/06-expressions.md +++ b/spec/06-expressions.md @@ -148,10 +148,6 @@ The selection $e.x$ is evaluated by first evaluating the qualifier expression $e$, which yields an object $r$, say. The selection's result is then the member of $r$ that is either defined by $m$ or defined by a definition overriding $m$. -If that member has a type which -conforms to `scala.NotNull`, the member's value must be initialized -to a value different from `null`, otherwise a `scala.UnitializedError` -is thrown. ## This and Super |