Skip to content

Commit 33c44dd

Browse files
committed
---
yaml --- r: 110056 b: refs/heads/auto c: 77d1978 h: refs/heads/master v: v3
1 parent ad5338d commit 33c44dd

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
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 0ce17d941dbeab048de21dd72f893d3dab982988
16+
refs/heads/auto: 77d1978f8e6535fdde242058f626b916a36b74c3
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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)