Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust the error messages to match the pattern "expected foo, found bar" #8413

Closed
wants to merge 19 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
88b89f8
Allow disabling optimizations in tests only
alexcrichton Aug 11, 2013
dcecc66
Cleanup librustpkg a little bit.
mstewartgallus Jul 18, 2013
ee5cfb0
Don't use unkillable in UnsafeArc dtor when there's no unwrapper. Clo…
bblum Aug 8, 2013
c8c09d4
Reorganise Select traits to not expose internal runtime types. Close …
bblum Aug 8, 2013
31f9b51
Make cell with_ref/with_mut_ref use finally. Close #7975.
bblum Aug 8, 2013
ce48e71
Fix select() in light of the deschedule...and then race. Close #8347.
bblum Aug 9, 2013
5ac8c57
Clean up transitionary glue in task/spawn.rs. Don't hold kill-little-…
bblum Aug 12, 2013
d376a01
make error messages conform to style guide
Aug 9, 2013
8b502d6
register snapshots
thestinger Aug 12, 2013
0cb0ef2
fix build with the new snapshot compiler
thestinger Aug 12, 2013
d9492d7
auto merge of #8450 : alexcrichton/rust/nopt-changes, r=graydon
bors Aug 13, 2013
44675ac
auto merge of #8476 : thestinger/rust/snapshot, r=brson
bors Aug 13, 2013
930885d
Forbid pub/priv where it has no effect
alexcrichton Aug 9, 2013
4601ea6
auto merge of #8487 : brson/rust/local-opts, r=brson
bors Aug 13, 2013
c99b2b9
auto merge of #7866 : sstewartgallus/rust/clean, r=cmr
bors Aug 13, 2013
f02cc6b
auto merge of #8411 : bblum/rust/assorted-fixes, r=brson
bors Aug 13, 2013
0d817ee
auto merge of #8423 : alexcrichton/rust/less-priv-again, r=bstrie
bors Aug 13, 2013
f6cb455
rebase
Aug 13, 2013
410cfad
Merge branch 'expect_found' of github.com:kud1ing/rust into expect_found
Aug 13, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libstd/rt/kill.rs
Original file line number Diff line number Diff line change
@@ -488,8 +488,8 @@ impl Death {
rtassert!(self.unkillable == 0);
self.unkillable = 1;

// FIXME(#7544): See corresponding fixme at the callsite in task.rs.
// NB(#8192): Doesn't work with "let _ = ..."
// NB. See corresponding comment at the callsite in task.rs.
// FIXME(#8192): Doesn't work with "let _ = ..."
{ use util; util::ignore(group); }

// Step 1. Decide if we need to collect child failures synchronously.
10 changes: 4 additions & 6 deletions src/libstd/rt/task.rs
Original file line number Diff line number Diff line change
@@ -253,12 +253,10 @@ impl Task {
}
}

// FIXME(#7544): We pass the taskgroup into death so that it can be
// dropped while the unkillable counter is set. This should not be
// necessary except for an extraneous clone() in task/spawn.rs that
// causes a killhandle to get dropped, which mustn't receive a kill
// signal since we're outside of the unwinder's try() scope.
// { let _ = self.taskgroup.take(); }
// NB. We pass the taskgroup into death so that it can be dropped while
// the unkillable counter is set. This is necessary for when the
// taskgroup destruction code drops references on KillHandles, which
// might require using unkillable (to synchronize with an unwrapper).
self.death.collect_failure(!self.unwinder.unwinding, self.taskgroup.take());
self.destroyed = true;
}
1 change: 0 additions & 1 deletion src/libstd/task/mod.rs
Original file line number Diff line number Diff line change
@@ -38,7 +38,6 @@
use prelude::*;

use cell::Cell;
use cmp::Eq;
use comm::{stream, Chan, GenericChan, GenericPort, Port};
use result::Result;
use result;
Loading