Skip to content

Commit 6d78819

Browse files
committed
fix a few remaining unused pattern binding warnings
1 parent 3e6ddf7 commit 6d78819

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/rustc/middle/ty.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ fn fold_regions_and_ty(
10351035
ty_trait(def_id, ref substs, vst) => {
10361036
ty::mk_trait(cx, def_id, fold_substs(substs, fldr, fldt), vst)
10371037
}
1038-
ref sty @ ty_fn(f) => {
1038+
ty_fn(f) => {
10391039
let new_proto;
10401040
match f.proto {
10411041
proto_bare =>
@@ -2229,7 +2229,7 @@ pure fn hash_region(r: &region) -> uint {
22292229
(hash_bound_region(&br)) << 2u | 1u,
22302230
re_scope(id) => ((id as uint) << 2u) | 2u,
22312231
re_var(id) => (id.to_uint() << 2u) | 3u,
2232-
re_bot => 4u
2232+
re_static => 4u
22332233
}
22342234
}
22352235

src/rustc/middle/typeck/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
892892
// functions. Therefore, we match one level of structure.
893893
let fn_ty =
894894
match structure_of(fcx, sp, in_fty) {
895-
sty @ ty::ty_fn(ref fn_ty) => {
895+
ty::ty_fn(ref fn_ty) => {
896896
replace_bound_regions_in_fn_ty(
897897
fcx.ccx.tcx, @nil, None, fn_ty,
898898
|_br| fcx.infcx.next_region_var(sp,

0 commit comments

Comments
 (0)