Skip to content

Commit

Permalink
Docs: tutorial: Remove a couple references to ~T
Browse files Browse the repository at this point in the history
  • Loading branch information
ipetkov committed Jun 23, 2014
1 parent 575710f commit 39efe3c
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/doc/tutorial.md
Expand Up @@ -2522,7 +2522,7 @@ fn sendable_foo(f: Box<Foo + Send>) { /* ... */ }
fn shareable_bar<T: Share>(b: &Bar<T> + Share) { /* ... */ }
~~~

When no colon is specified (such as the type `~Foo`), it is inferred that the
When no colon is specified (such as the type `Box<Foo>`), it is inferred that the
value ascribes to no bounds. They must be added manually if any bounds are
necessary for usage.

Expand Down Expand Up @@ -2579,17 +2579,18 @@ fn radius_times_area<T: Circle>(c: T) -> f64 {

Likewise, supertrait methods may also be called on trait objects.

~~~ {.ignore}
~~~
use std::f64::consts::PI;
# trait Shape { fn area(&self) -> f64; }
# trait Circle : Shape { fn radius(&self) -> f64; }
# struct Point { x: f64, y: f64 }
# struct CircleStruct { center: Point, radius: f64 }
# impl Circle for CircleStruct { fn radius(&self) -> f64 { (self.area() / PI).sqrt() } }
# impl Shape for CircleStruct { fn area(&self) -> f64 { PI * square(self.radius) } }
# fn square(x: f64) -> f64 { x * x }
let concrete = ~CircleStruct{center:Point{x:3.0,y:4.0},radius:5.0};
let mycircle: ~Circle = concrete as ~Circle;
let concrete = box CircleStruct{center:Point{x:3.0,y:4.0},radius:5.0};
let mycircle: Box<Circle> = concrete as Box<Circle>;
let nonsense = mycircle.radius() * mycircle.area();
~~~

Expand Down

5 comments on commit 39efe3c

@bors
Copy link
Contributor

@bors bors commented on 39efe3c Jun 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 39efe3c Jun 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging ipetkov/rust/tutorial-update = 39efe3c into auto

@bors
Copy link
Contributor

@bors bors commented on 39efe3c Jun 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ipetkov/rust/tutorial-update = 39efe3c merged ok, testing candidate = 58bf8b2

@bors
Copy link
Contributor

@bors bors commented on 39efe3c Jun 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 58bf8b2

Please sign in to comment.