Skip to content

Commit d1de655

Browse files
committed
---
yaml --- r: 150494 b: refs/heads/try2 c: 77d1978 h: refs/heads/master v: v3
1 parent 0ae08ec commit d1de655

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 0ce17d941dbeab048de21dd72f893d3dab982988
8+
refs/heads/try2: 77d1978f8e6535fdde242058f626b916a36b74c3
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/borrowck/mod.rs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ pub struct RestrictionSet {
326326
bits: u32
327327
}
328328

329+
#[allow(dead_code)] // potentially useful
329330
pub static RESTR_EMPTY: RestrictionSet = RestrictionSet {bits: 0b0000};
330331
pub static RESTR_MUTATE: RestrictionSet = RestrictionSet {bits: 0b0001};
331332
pub static RESTR_FREEZE: RestrictionSet = RestrictionSet {bits: 0b0010};
@@ -334,10 +335,6 @@ impl RestrictionSet {
334335
pub fn intersects(&self, restr: RestrictionSet) -> bool {
335336
(self.bits & restr.bits) != 0
336337
}
337-
338-
pub fn contains_all(&self, restr: RestrictionSet) -> bool {
339-
(self.bits & restr.bits) == restr.bits
340-
}
341338
}
342339

343340
impl BitOr<RestrictionSet,RestrictionSet> for RestrictionSet {
@@ -862,17 +859,6 @@ impl<'a> BorrowckCtxt<'a> {
862859
pub fn cmt_to_str(&self, cmt: mc::cmt) -> ~str {
863860
self.mc().cmt_to_str(cmt)
864861
}
865-
866-
pub fn mut_to_str(&self, mutbl: ast::Mutability) -> ~str {
867-
self.mc().mut_to_str(mutbl)
868-
}
869-
870-
pub fn mut_to_keyword(&self, mutbl: ast::Mutability) -> &'static str {
871-
match mutbl {
872-
ast::MutImmutable => "",
873-
ast::MutMutable => "mut",
874-
}
875-
}
876862
}
877863

878864
impl DataFlowOperator for LoanDataFlowOperator {

0 commit comments

Comments
 (0)