Skip to content

Commit

Permalink
Add more type signatures to the docs; tweak a few of them.
Browse files Browse the repository at this point in the history
Someone reading the docs won't know what the types of various things
are, so this adds them in a few meaningful places to help with
comprehension.

cc #13423.
  • Loading branch information
huonw committed Apr 11, 2014
1 parent 0156af1 commit 5b109a1
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 27 deletions.
20 changes: 13 additions & 7 deletions src/libstd/fmt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -276,16 +276,22 @@ references information on the stack. Under the hood, all of
the related macros are implemented in terms of this. First
off, some example usage is:
```ignore
```
use std::fmt;
use std::io;
# fn lol<T>() -> T { fail!() }
# let my_writer: &mut ::std::io::Writer = lol();
# let my_fn: fn(&fmt::Arguments) = lol();
# #[allow(unused_must_use)]
# fn main() {
format_args!(fmt::format, "this returns {}", "~str");
format_args!(|args| { fmt::write(my_writer, args) }, "some {}", "args");
format_args!(my_fn, "format {}", "string");
let some_writer: &mut io::Writer = &mut io::stdout();
format_args!(|args| { fmt::write(some_writer, args) }, "print with a {}", "closure");
fn my_fmt_fn(args: &fmt::Arguments) {
fmt::write(&mut io::stdout(), args);
}
format_args!(my_fmt_fn, "or a {} too", "function");
# }
```
The first argument of the `format_args!` macro is a function (or closure) which
Expand Down
21 changes: 14 additions & 7 deletions src/libstd/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ Some examples of obvious things you might want to do
```rust
# fn main() { }
# fn foo() {
# #[allow(unused_must_use, dead_code)];
use std::io::net::tcp::TcpListener;
# #![allow(dead_code)]
use std::io::{TcpListener, TcpStream};
use std::io::net::ip::{Ipv4Addr, SocketAddr};
use std::io::{Acceptor, Listener};
Expand All @@ -108,12 +108,19 @@ Some examples of obvious things you might want to do
// bind the listener to the specified address
let mut acceptor = listener.listen();
// accept connections and process them
# fn handle_client<T>(_: T) {}
fn handle_client(mut stream: TcpStream) {
// ...
# &mut stream; // silence unused mutability/variable warning
}
// accept connections and process them, spawning a new tasks for each one
for stream in acceptor.incoming() {
spawn(proc() {
handle_client(stream);
});
match stream {
Err(e) => { /* connection failed */ }
Ok(stream) => spawn(proc() {
// connection succeeded
handle_client(stream)
})
}
}
// close the socket server
Expand Down
24 changes: 15 additions & 9 deletions src/libstd/io/net/tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ impl Writer for TcpStream {
/// # Example
///
/// ```rust
/// # fn main() {}
/// # fn main() { }
/// # fn foo() {
/// # #[allow(unused_must_use, dead_code)];
/// use std::io::net::tcp::TcpListener;
/// # #![allow(dead_code)]
/// use std::io::{TcpListener, TcpStream};
/// use std::io::net::ip::{Ipv4Addr, SocketAddr};
/// use std::io::{Acceptor, Listener};
///
Expand All @@ -113,12 +113,19 @@ impl Writer for TcpStream {
/// // bind the listener to the specified address
/// let mut acceptor = listener.listen();
///
/// // accept connections and process them
/// # fn handle_client<T>(_: T) {}
/// fn handle_client(mut stream: TcpStream) {
/// // ...
/// # &mut stream; // silence unused mutability/variable warning
/// }
/// // accept connections and process them, spawning a new tasks for each one
/// for stream in acceptor.incoming() {
/// spawn(proc() {
/// handle_client(stream);
/// });
/// match stream {
/// Err(e) => { /* connection failed */ }
/// Ok(stream) => spawn(proc() {
/// // connection succeeded
/// handle_client(stream)
/// })
/// }
/// }
///
/// // close the socket server
Expand Down Expand Up @@ -728,4 +735,3 @@ mod test {
assert_eq!(s.read_to_end(), Ok(vec!(1)));
})
}

2 changes: 1 addition & 1 deletion src/libstd/sync/atomics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ pub struct AtomicOption<T> {
///
/// Rust's memory orderings are the same as in C++[1].
///
/// [1]: http://gcc.gnu.org/wiki/Atomic/GCCMM/AtomicSync
/// 1: http://gcc.gnu.org/wiki/Atomic/GCCMM/AtomicSync
pub enum Ordering {
/// No ordering constraints, only atomic operations
Relaxed,
Expand Down
4 changes: 1 addition & 3 deletions src/libstd/unstable/finally.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@ also be used. See that function for more details.
```
use std::unstable::finally::Finally;
# fn always_run_this() {}
(|| {
// ...
}).finally(|| {
always_run_this();
// this code is always run
})
```
*/
Expand Down Expand Up @@ -158,4 +157,3 @@ fn test_compact() {
do_some_fallible_work.finally(
but_always_run_this_function);
}

5 comments on commit 5b109a1

@bors
Copy link
Contributor

@bors bors commented on 5b109a1 Apr 11, 2014

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at huonw@5b109a1

@bors
Copy link
Contributor

@bors bors commented on 5b109a1 Apr 11, 2014

Choose a reason for hiding this comment

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

merging huonw/rust/doc-signatures = 5b109a1 into auto

@bors
Copy link
Contributor

@bors bors commented on 5b109a1 Apr 11, 2014

Choose a reason for hiding this comment

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

huonw/rust/doc-signatures = 5b109a1 merged ok, testing candidate = b7e9306

@bors
Copy link
Contributor

@bors bors commented on 5b109a1 Apr 11, 2014

@bors
Copy link
Contributor

@bors bors commented on 5b109a1 Apr 11, 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 = b7e9306

Please sign in to comment.