Skip to content

Commit

Permalink
Minor fix to docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
@xales
xales committed Jan 27, 2014
1 parent 0119e46 commit f572379
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion doc/guide-runtime.md
View file
Expand Up @@ -176,7 +176,7 @@ implemented in user-space.
The primary concern of an M:N runtime is that a Rust task cannot block itself in
a syscall. If this happens, then the entire OS thread is frozen and unavailable
for running more Rust tasks, making this a (M-1):N runtime (and you can see how
this can reach 0/deadlock. By using asynchronous I/O under the hood (all I/O
this can reach 0/deadlock). By using asynchronous I/O under the hood (all I/O
still looks synchronous in terms of code), OS threads are never blocked until
the appropriate time comes.

Expand Down

9 comments on commit f572379

@bors
Copy link
Contributor

@bors bors commented on f572379 Jan 27, 2014

Choose a reason for hiding this comment

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

saw approval from cmr, huonw, alexcrichton
at xales@f572379

@bors
Copy link
Contributor

@bors bors commented on f572379 Jan 27, 2014

Choose a reason for hiding this comment

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

merging xales/rust/doc-fixes = f572379 into auto

@bors
Copy link
Contributor

@bors bors commented on f572379 Jan 27, 2014

Choose a reason for hiding this comment

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

xales/rust/doc-fixes = f572379 merged ok, testing candidate = 1caa5b90

@bors
Copy link
Contributor

@bors bors commented on f572379 Jan 27, 2014

Choose a reason for hiding this comment

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

some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2936
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3828
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1670
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1672
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3828
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2928
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2934
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3843
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2931
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2937
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3845
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2931
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/3005
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3836
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2937
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2942
exception: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3605

@bors
Copy link
Contributor

@bors bors commented on f572379 Jan 28, 2014

Choose a reason for hiding this comment

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

saw approval from cmr, huonw, alexcrichton
at xales@f572379

@bors
Copy link
Contributor

@bors bors commented on f572379 Jan 28, 2014

Choose a reason for hiding this comment

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

merging xales/rust/doc-fixes = f572379 into auto

@bors
Copy link
Contributor

@bors bors commented on f572379 Jan 28, 2014

Choose a reason for hiding this comment

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

xales/rust/doc-fixes = f572379 merged ok, testing candidate = 3781728

@bors
Copy link
Contributor

@bors bors commented on f572379 Jan 28, 2014

Choose a reason for hiding this comment

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

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3848
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1690
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1692
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3848
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2948
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2954
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3863
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2951
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2957
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3865
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2951
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2956
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/3025
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/803
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3856
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2957
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2962
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3625

@bors
Copy link
Contributor

@bors bors commented on f572379 Jan 28, 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 = 3781728

Please sign in to comment.