Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 785a8a6

Browse files
committedDec 16, 2015
Auto merge of #30410 - Manishearth:rollup, r=Manishearth
- Successful merges: #30320, #30368, #30372, #30376, #30388, #30392 - Failed merges: #30354, #30389
2 parents ce7bc51 + f0361a0 commit 785a8a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+455
-270
lines changed
 

‎src/libcollections/btree/set.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,17 @@ use Bound;
2626

2727
/// A set based on a B-Tree.
2828
///
29-
/// See BTreeMap's documentation for a detailed discussion of this collection's performance
29+
/// See [`BTreeMap`]'s documentation for a detailed discussion of this collection's performance
3030
/// benefits and drawbacks.
3131
///
3232
/// It is a logic error for an item to be modified in such a way that the item's ordering relative
33-
/// to any other item, as determined by the `Ord` trait, changes while it is in the set. This is
34-
/// normally only possible through `Cell`, `RefCell`, global state, I/O, or unsafe code.
33+
/// to any other item, as determined by the [`Ord`] trait, changes while it is in the set. This is
34+
/// normally only possible through [`Cell`], [`RefCell`], global state, I/O, or unsafe code.
35+
///
36+
/// [`BTreeMap`]: ../struct.BTreeMap.html
37+
/// [`Ord`]: ../../core/cmp/trait.Ord.html
38+
/// [`Cell`]: ../../std/cell/struct.Cell.html
39+
/// [`RefCell`]: ../../std/cell/struct.RefCell.html
3540
#[derive(Clone, Hash, PartialEq, Eq, Ord, PartialOrd)]
3641
#[stable(feature = "rust1", since = "1.0.0")]
3742
pub struct BTreeSet<T> {

‎src/librustc/middle/check_static_recursion.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@ pub fn check_crate<'ast>(sess: &Session,
9999
ast_map: ast_map,
100100
discriminant_map: RefCell::new(NodeMap()),
101101
};
102-
krate.visit_all_items(&mut visitor);
103-
sess.abort_if_errors();
102+
sess.abort_if_new_errors(|| {
103+
krate.visit_all_items(&mut visitor);
104+
});
104105
}
105106

106107
struct CheckItemRecursionVisitor<'a, 'ast: 'a> {

0 commit comments

Comments
 (0)
Please sign in to comment.