Skip to content

Commit 78f13d1

Browse files
thestingerthestinger
committed
---
yaml --- r: 52035 b: refs/heads/dist-snap c: 2cf2d6a h: refs/heads/master i: 52033: 0fce700 52031: bd24528 v: v3
1 parent 07b3031 commit 78f13d1

File tree

8 files changed

+6
-275
lines changed

8 files changed

+6
-275
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
10-
refs/heads/dist-snap: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
10+
refs/heads/dist-snap: 2cf2d6aa923a3d05f5bc9caae4cac757e1e27b57
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/src/etc/vim/syntax/rust.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
" Language: Rust
33
" Maintainer: Patrick Walton <[email protected]>
44
" Maintainer: Ben Blum <[email protected]>
5-
" Last Change: 2012 Dec 14
5+
" Last Change: 2012 Dec 25
66

77
if version < 600
88
syntax clear
@@ -44,8 +44,8 @@ syn keyword rustType off_t dev_t ino_t pid_t mode_t ssize_t
4444

4545
syn keyword rustTrait Const Copy Send Owned " inherent traits
4646
syn keyword rustTrait Eq Ord Num Ptr
47-
syn keyword rustTrait Add Sub Mul Div Modulo Neg BitAnd BitOr BitXor
48-
syn keyword rustTrait Shl Shr Index
47+
syn keyword rustTrait Drop Add Sub Mul Div Modulo Neg BitAnd BitOr
48+
syn keyword rustTrait BitXor Shl Shr Index
4949

5050
syn keyword rustSelf self
5151
syn keyword rustBoolean true false

‎branches/dist-snap/src/libcargo/pgp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ fn verify(root: &Path, data: &Path, sig: &Path) -> bool {
102102
let path = root.push("gpg");
103103
let res = gpgv(~[~"--homedir", path.to_str(),
104104
~"--keyring", ~"pubring.gpg",
105-
~"--verify",
105+
~"--verbose",
106106
sig.to_str(), data.to_str()]);
107107
if res.status != 0 {
108108
return false;

‎branches/dist-snap/src/librustc/middle/trans/base.rs

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,30 +2396,6 @@ fn declare_intrinsics(llmod: ModuleRef) -> HashMap<~str, ValueRef> {
23962396
T_fn(~[T_f32()], T_f32()));
23972397
let truncf64 = decl_cdecl_fn(llmod, ~"llvm.trunc.f64",
23982398
T_fn(~[T_f64()], T_f64()));
2399-
let ctpop8 = decl_cdecl_fn(llmod, ~"llvm.ctpop.i8",
2400-
T_fn(~[T_i8()], T_i8()));
2401-
let ctpop16 = decl_cdecl_fn(llmod, ~"llvm.ctpop.i16",
2402-
T_fn(~[T_i16()], T_i16()));
2403-
let ctpop32 = decl_cdecl_fn(llmod, ~"llvm.ctpop.i32",
2404-
T_fn(~[T_i32()], T_i32()));
2405-
let ctpop64 = decl_cdecl_fn(llmod, ~"llvm.ctpop.i64",
2406-
T_fn(~[T_i64()], T_i64()));
2407-
let ctlz8 = decl_cdecl_fn(llmod, ~"llvm.ctlz.i8",
2408-
T_fn(~[T_i8(), T_i1()], T_i8()));
2409-
let ctlz16 = decl_cdecl_fn(llmod, ~"llvm.ctlz.i16",
2410-
T_fn(~[T_i16(), T_i1()], T_i16()));
2411-
let ctlz32 = decl_cdecl_fn(llmod, ~"llvm.ctlz.i32",
2412-
T_fn(~[T_i32(), T_i1()], T_i32()));
2413-
let ctlz64 = decl_cdecl_fn(llmod, ~"llvm.ctlz.i64",
2414-
T_fn(~[T_i64(), T_i1()], T_i64()));
2415-
let cttz8 = decl_cdecl_fn(llmod, ~"llvm.cttz.i8",
2416-
T_fn(~[T_i8(), T_i1()], T_i8()));
2417-
let cttz16 = decl_cdecl_fn(llmod, ~"llvm.cttz.i16",
2418-
T_fn(~[T_i16(), T_i1()], T_i16()));
2419-
let cttz32 = decl_cdecl_fn(llmod, ~"llvm.cttz.i32",
2420-
T_fn(~[T_i32(), T_i1()], T_i32()));
2421-
let cttz64 = decl_cdecl_fn(llmod, ~"llvm.cttz.i64",
2422-
T_fn(~[T_i64(), T_i1()], T_i64()));
24232399

24242400
let intrinsics = HashMap();
24252401
intrinsics.insert(~"llvm.gcroot", gcroot);
@@ -2460,18 +2436,6 @@ fn declare_intrinsics(llmod: ModuleRef) -> HashMap<~str, ValueRef> {
24602436
intrinsics.insert(~"llvm.ceil.f64", ceilf64);
24612437
intrinsics.insert(~"llvm.trunc.f32", truncf32);
24622438
intrinsics.insert(~"llvm.trunc.f64", truncf64);
2463-
intrinsics.insert(~"llvm.ctpop.i8", ctpop8);
2464-
intrinsics.insert(~"llvm.ctpop.i16", ctpop16);
2465-
intrinsics.insert(~"llvm.ctpop.i32", ctpop32);
2466-
intrinsics.insert(~"llvm.ctpop.i64", ctpop64);
2467-
intrinsics.insert(~"llvm.ctlz.i8", ctlz8);
2468-
intrinsics.insert(~"llvm.ctlz.i16", ctlz16);
2469-
intrinsics.insert(~"llvm.ctlz.i32", ctlz32);
2470-
intrinsics.insert(~"llvm.ctlz.i64", ctlz64);
2471-
intrinsics.insert(~"llvm.cttz.i8", cttz8);
2472-
intrinsics.insert(~"llvm.cttz.i16", cttz16);
2473-
intrinsics.insert(~"llvm.cttz.i32", cttz32);
2474-
intrinsics.insert(~"llvm.cttz.i64", cttz64);
24752439

24762440
return intrinsics;
24772441
}

‎branches/dist-snap/src/librustc/middle/trans/foreign.rs

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,74 +1194,6 @@ fn trans_intrinsic(ccx: @crate_ctxt, decl: ValueRef, item: @ast::foreign_item,
11941194
let truncf = ccx.intrinsics.get(~"llvm.trunc.f64");
11951195
Store(bcx, Call(bcx, truncf, ~[x]), fcx.llretptr);
11961196
}
1197-
~"ctpop8" => {
1198-
let x = get_param(decl, first_real_arg);
1199-
let ctpop = ccx.intrinsics.get(~"llvm.ctpop.i8");
1200-
Store(bcx, Call(bcx, ctpop, ~[x]), fcx.llretptr)
1201-
}
1202-
~"ctpop16" => {
1203-
let x = get_param(decl, first_real_arg);
1204-
let ctpop = ccx.intrinsics.get(~"llvm.ctpop.i16");
1205-
Store(bcx, Call(bcx, ctpop, ~[x]), fcx.llretptr)
1206-
}
1207-
~"ctpop32" => {
1208-
let x = get_param(decl, first_real_arg);
1209-
let ctpop = ccx.intrinsics.get(~"llvm.ctpop.i32");
1210-
Store(bcx, Call(bcx, ctpop, ~[x]), fcx.llretptr)
1211-
}
1212-
~"ctpop64" => {
1213-
let x = get_param(decl, first_real_arg);
1214-
let ctpop = ccx.intrinsics.get(~"llvm.ctpop.i64");
1215-
Store(bcx, Call(bcx, ctpop, ~[x]), fcx.llretptr)
1216-
}
1217-
~"ctlz8" => {
1218-
let x = get_param(decl, first_real_arg);
1219-
let y = C_bool(false);
1220-
let ctlz = ccx.intrinsics.get(~"llvm.ctlz.i8");
1221-
Store(bcx, Call(bcx, ctlz, ~[x, y]), fcx.llretptr)
1222-
}
1223-
~"ctlz16" => {
1224-
let x = get_param(decl, first_real_arg);
1225-
let y = C_bool(false);
1226-
let ctlz = ccx.intrinsics.get(~"llvm.ctlz.i16");
1227-
Store(bcx, Call(bcx, ctlz, ~[x, y]), fcx.llretptr)
1228-
}
1229-
~"ctlz32" => {
1230-
let x = get_param(decl, first_real_arg);
1231-
let y = C_bool(false);
1232-
let ctlz = ccx.intrinsics.get(~"llvm.ctlz.i32");
1233-
Store(bcx, Call(bcx, ctlz, ~[x, y]), fcx.llretptr)
1234-
}
1235-
~"ctlz64" => {
1236-
let x = get_param(decl, first_real_arg);
1237-
let y = C_bool(false);
1238-
let ctlz = ccx.intrinsics.get(~"llvm.ctlz.i64");
1239-
Store(bcx, Call(bcx, ctlz, ~[x, y]), fcx.llretptr)
1240-
}
1241-
~"cttz8" => {
1242-
let x = get_param(decl, first_real_arg);
1243-
let y = C_bool(false);
1244-
let cttz = ccx.intrinsics.get(~"llvm.cttz.i8");
1245-
Store(bcx, Call(bcx, cttz, ~[x, y]), fcx.llretptr)
1246-
}
1247-
~"cttz16" => {
1248-
let x = get_param(decl, first_real_arg);
1249-
let y = C_bool(false);
1250-
let cttz = ccx.intrinsics.get(~"llvm.cttz.i16");
1251-
Store(bcx, Call(bcx, cttz, ~[x, y]), fcx.llretptr)
1252-
}
1253-
~"cttz32" => {
1254-
let x = get_param(decl, first_real_arg);
1255-
let y = C_bool(false);
1256-
let cttz = ccx.intrinsics.get(~"llvm.cttz.i32");
1257-
Store(bcx, Call(bcx, cttz, ~[x, y]), fcx.llretptr)
1258-
}
1259-
~"cttz64" => {
1260-
let x = get_param(decl, first_real_arg);
1261-
let y = C_bool(false);
1262-
let cttz = ccx.intrinsics.get(~"llvm.cttz.i64");
1263-
Store(bcx, Call(bcx, cttz, ~[x, y]), fcx.llretptr)
1264-
}
12651197
_ => {
12661198
// Could we make this an enum rather than a string? does it get
12671199
// checked earlier?

‎branches/dist-snap/src/librustc/middle/trans/type_use.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,6 @@ fn type_uses_for(ccx: @crate_ctxt, fn_id: def_id, n_tps: uint)
130130
~"floorf32"| ~"floorf64"| ~"ceilf32" | ~"ceilf64" |
131131
~"truncf32"| ~"truncf64" => 0,
132132

133-
~"ctpop8" | ~"ctpop16" | ~"ctpop32" | ~"ctpop64" => 0,
134-
135-
~"ctlz8" | ~"ctlz16" | ~"ctlz32" | ~"ctlz64" => 0,
136-
~"cttz8" | ~"cttz16" | ~"cttz32" | ~"cttz64" => 0,
137-
138133
// would be cool to make these an enum instead of strings!
139134
_ => fail ~"unknown intrinsic in type_use"
140135
};

‎branches/dist-snap/src/librustc/middle/typeck/check/mod.rs

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3156,55 +3156,7 @@ fn check_intrinsic_type(ccx: @crate_ctxt, it: @ast::foreign_item) {
31563156
(0u, ~[arg(ast::by_copy, ty::mk_f64(tcx))],
31573157
ty::mk_f64(tcx))
31583158
}
3159-
~"ctpop8" => {
3160-
(0u, ~[arg(ast::by_copy, ty::mk_i8(tcx))],
3161-
ty::mk_i8(tcx))
3162-
}
3163-
~"ctpop16" => {
3164-
(0u, ~[arg(ast::by_copy, ty::mk_i16(tcx))],
3165-
ty::mk_i16(tcx))
3166-
}
3167-
~"ctpop32" => {
3168-
(0u, ~[arg(ast::by_copy, ty::mk_i32(tcx))],
3169-
ty::mk_i32(tcx))
3170-
}
3171-
~"ctpop64" => {
3172-
(0u, ~[arg(ast::by_copy, ty::mk_i64(tcx))],
3173-
ty::mk_i64(tcx))
3174-
}
3175-
~"ctlz8" => {
3176-
(0u, ~[arg(ast::by_copy, ty::mk_i8(tcx))],
3177-
ty::mk_i8(tcx))
3178-
}
3179-
~"ctlz16" => {
3180-
(0u, ~[arg(ast::by_copy, ty::mk_i16(tcx))],
3181-
ty::mk_i16(tcx))
3182-
}
3183-
~"ctlz32" => {
3184-
(0u, ~[arg(ast::by_copy, ty::mk_i32(tcx))],
3185-
ty::mk_i32(tcx))
3186-
}
3187-
~"ctlz64" => {
3188-
(0u, ~[arg(ast::by_copy, ty::mk_i64(tcx))],
3189-
ty::mk_i64(tcx))
3190-
}
3191-
~"cttz8" => {
3192-
(0u, ~[arg(ast::by_copy, ty::mk_i8(tcx))],
3193-
ty::mk_i8(tcx))
3194-
}
3195-
~"cttz16" => {
3196-
(0u, ~[arg(ast::by_copy, ty::mk_i16(tcx))],
3197-
ty::mk_i16(tcx))
3198-
}
3199-
~"cttz32" => {
3200-
(0u, ~[arg(ast::by_copy, ty::mk_i32(tcx))],
3201-
ty::mk_i32(tcx))
3202-
}
3203-
~"cttz64" => {
3204-
(0u, ~[arg(ast::by_copy, ty::mk_i64(tcx))],
3205-
ty::mk_i64(tcx))
3206-
}
3207-
ref other => {
3159+
ref other => {
32083160
tcx.sess.span_err(it.span, ~"unrecognized intrinsic function: `" +
32093161
(*other) + ~"`");
32103162
return;

‎branches/dist-snap/src/test/run-pass/intrinsics-integer.rs

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)