Skip to content

Commit

Permalink
Merge branch 'master' of github.com:async-std/async-std
Browse files Browse the repository at this point in the history
  • Loading branch information
skade committed Aug 19, 2019
2 parents de036b9 + 68c066a commit addda39
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ matrix:
env: BUILD_DOCS=1
- rust: nightly
os: osx
osx_image: xcode9.2
env: BUILD_DOCS=1
- rust: nightly-x86_64-pc-windows-msvc
os: windows
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ mio-uds = "0.6.7"
num_cpus = "1.10.0"
pin-utils = "0.1.0-alpha.4"
slab = "0.4.2"
surf = "1.0.1"

[dev-dependencies]
femme = "1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion docs/src/concepts/futures.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Luckily, concurrent Rust already has two well-known and effective concepts abstr

As a quick summary:

- `Send` abstracts over *passing data* in a computation to another concurrent computation (let's call it the receiver), losing access to it on the sender side. In many programming languages, this strategy is commonly implemented, but missing support from the language side expects you to enforce the "losing access" behaviour yourself. This is a regular source of bugs: senders keeping handles to sent things around and maybe even working with them after sending. Rust mitigates this problem by making this behaviour known. Types can be `Send` or not (by implementing the appropriate marker trait), allowing or disallowing sending them around, and the ownership and borrowing rules prevent subsequent access.
- `Send` abstracts over *passing data* in a computation to another concurrent computation (let's call it the receiver), losing access to it on the sender side. In many programming languages, this strategy is commonly implemented, but missing support from the language side, and expects you to enforce the "losing access" behaviour yourself. This is a regular source of bugs: senders keeping handles to sent things around and maybe even working with them after sending. Rust mitigates this problem by making this behaviour known. Types can be `Send` or not (by implementing the appropriate marker trait), allowing or disallowing sending them around, and the ownership and borrowing rules prevent subsequent access.

- `Sync` is about *sharing data* between two concurrent parts of a program. This is another common pattern: as writing to a memory location or reading while another party is writing is inherently unsafe, this access needs to be moderated through synchronisation.[^1] There are many common ways for two parties to agree on not using the same part in memory at the same time, for example mutexes and spinlocks. Again, Rust gives you the option of (safely!) not caring. Rust gives you the ability to express that something *needs* synchronisation while not being specific about the *how*.

Expand Down
4 changes: 2 additions & 2 deletions docs/src/concepts/tasks.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ Tasks in `async_std` are one of the core abstractions. Much like Rust's `thread`

- They are allocated in one single allocation
- All tasks have a *backchannel*, which allows them to propagate results and errors to the spawning task through the `JoinHandle`
- The carry useful metadata for debugging
- They carry useful metadata for debugging
- They support task local storage

`async_std`s task api handles setup and teardown of a backing runtime for you and doesn't rely on a runtime being explicitly started.
`async_std`s task API handles setup and teardown of a backing runtime for you and doesn't rely on a runtime being explicitly started.

## Blocking

Expand Down
21 changes: 21 additions & 0 deletions examples/surf-web.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//! Sends an HTTP request to the Rust website.
#![feature(async_await)]

use async_std::task;

fn main() -> Result<(), surf::Exception> {
task::block_on(async {
let url = "https://www.rust-lang.org";
let mut response = surf::get(url).await?;
let body = response.body_string().await?;

dbg!(url);
dbg!(response.status());
dbg!(response.version());
dbg!(response.headers());
dbg!(body.len());

Ok(())
})
}

0 comments on commit addda39

Please sign in to comment.