Skip to content

Commit b18af2c

Browse files
brsonbrson
committed
---
yaml --- r: 69549 b: refs/heads/auto c: 05eff5f h: refs/heads/master i: 69547: fc3472b v: v3
1 parent 9a31b3f commit b18af2c

File tree

18 files changed

+1
-294
lines changed

18 files changed

+1
-294
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 1d256ba6e83c9f779e8c9a5346eb5df95ef589b2
17+
refs/heads/auto: 05eff5f731fbdf0597bb6a4b94a7603571ff66b6
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

‎branches/auto/src/libextra/dbg.rs

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

‎branches/auto/src/libextra/extra.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ pub mod sha2;
7878

7979
pub mod url;
8080
pub mod ebml;
81-
pub mod dbg;
8281
pub mod getopts;
8382
pub mod json;
8483
pub mod md4;

‎branches/auto/src/libstd/unstable/atomics.rs

Lines changed: 0 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,6 @@ impl AtomicInt {
205205
pub fn fetch_sub(&mut self, val: int, order: Ordering) -> int {
206206
unsafe { atomic_sub(&mut self.v, val, order) }
207207
}
208-
209-
/// Returns the old value
210-
#[inline]
211-
pub fn fetch_min(&mut self, val: int, order: Ordering) -> int {
212-
unsafe { atomic_min(&mut self.v, val, order) }
213-
}
214-
215-
/// Returns the old value
216-
#[inline]
217-
pub fn fetch_max(&mut self, val: int, order: Ordering) -> int {
218-
unsafe { atomic_max(&mut self.v, val, order) }
219-
}
220208
}
221209

222210
impl AtomicUint {
@@ -255,18 +243,6 @@ impl AtomicUint {
255243
pub fn fetch_sub(&mut self, val: uint, order: Ordering) -> uint {
256244
unsafe { atomic_sub(&mut self.v, val, order) }
257245
}
258-
259-
/// Returns the old value
260-
#[inline]
261-
pub fn fetch_min(&mut self, val: uint, order: Ordering) -> uint {
262-
unsafe { atomic_umin(&mut self.v, val, order) }
263-
}
264-
265-
/// Returns the old value
266-
#[inline]
267-
pub fn fetch_max(&mut self, val: uint, order: Ordering) -> uint {
268-
unsafe { atomic_umax(&mut self.v, val, order) }
269-
}
270246
}
271247

272248
impl<T> AtomicPtr<T> {
@@ -515,64 +491,6 @@ pub unsafe fn atomic_xor<T>(dst: &mut T, val: T, order: Ordering) -> T {
515491
}
516492

517493

518-
#[inline]
519-
pub unsafe fn atomic_max<T>(dst: &mut T, val: T, order: Ordering) -> T {
520-
let dst = cast::transmute(dst);
521-
let val = cast::transmute(val);
522-
523-
cast::transmute(match order {
524-
Acquire => intrinsics::atomic_max_acq(dst, val),
525-
Release => intrinsics::atomic_max_rel(dst, val),
526-
AcqRel => intrinsics::atomic_max_acqrel(dst, val),
527-
Relaxed => intrinsics::atomic_max_relaxed(dst, val),
528-
_ => intrinsics::atomic_max(dst, val)
529-
})
530-
}
531-
532-
533-
#[inline]
534-
pub unsafe fn atomic_min<T>(dst: &mut T, val: T, order: Ordering) -> T {
535-
let dst = cast::transmute(dst);
536-
let val = cast::transmute(val);
537-
538-
cast::transmute(match order {
539-
Acquire => intrinsics::atomic_min_acq(dst, val),
540-
Release => intrinsics::atomic_min_rel(dst, val),
541-
AcqRel => intrinsics::atomic_min_acqrel(dst, val),
542-
Relaxed => intrinsics::atomic_min_relaxed(dst, val),
543-
_ => intrinsics::atomic_min(dst, val)
544-
})
545-
}
546-
547-
#[inline]
548-
pub unsafe fn atomic_umax<T>(dst: &mut T, val: T, order: Ordering) -> T {
549-
let dst = cast::transmute(dst);
550-
let val = cast::transmute(val);
551-
552-
cast::transmute(match order {
553-
Acquire => intrinsics::atomic_umax_acq(dst, val),
554-
Release => intrinsics::atomic_umax_rel(dst, val),
555-
AcqRel => intrinsics::atomic_umax_acqrel(dst, val),
556-
Relaxed => intrinsics::atomic_umax_relaxed(dst, val),
557-
_ => intrinsics::atomic_umax(dst, val)
558-
})
559-
}
560-
561-
562-
#[inline]
563-
pub unsafe fn atomic_umin<T>(dst: &mut T, val: T, order: Ordering) -> T {
564-
let dst = cast::transmute(dst);
565-
let val = cast::transmute(val);
566-
567-
cast::transmute(match order {
568-
Acquire => intrinsics::atomic_umin_acq(dst, val),
569-
Release => intrinsics::atomic_umin_rel(dst, val),
570-
AcqRel => intrinsics::atomic_umin_acqrel(dst, val),
571-
Relaxed => intrinsics::atomic_umin_relaxed(dst, val),
572-
_ => intrinsics::atomic_umin(dst, val)
573-
})
574-
}
575-
576494
/**
577495
* An atomic fence.
578496
*

‎branches/auto/src/libstd/unstable/lang.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ pub mod rustrt {
4141

4242
#[rust_stack]
4343
pub fn rust_try_get_task() -> *rust_task;
44-
45-
pub fn rust_dbg_breakpoint();
4644
}
4745
}
4846

‎branches/auto/src/rt/rust_builtin.cpp

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -150,93 +150,6 @@ debug_static_mut_check_four() {
150150
assert(debug_static_mut == 4);
151151
}
152152

153-
/* Debug builtins for std::dbg. */
154-
155-
static void
156-
debug_tydesc_helper(type_desc *t)
157-
{
158-
rust_task *task = rust_get_current_task();
159-
LOG(task, stdlib, " size %" PRIdPTR ", align %" PRIdPTR,
160-
t->size, t->align);
161-
}
162-
163-
extern "C" CDECL void
164-
debug_tydesc(type_desc *t) {
165-
rust_task *task = rust_get_current_task();
166-
LOG(task, stdlib, "debug_tydesc");
167-
debug_tydesc_helper(t);
168-
}
169-
170-
extern "C" CDECL void
171-
debug_opaque(type_desc *t, uint8_t *front) {
172-
rust_task *task = rust_get_current_task();
173-
LOG(task, stdlib, "debug_opaque");
174-
debug_tydesc_helper(t);
175-
// Account for alignment. `front` may not indeed be the
176-
// front byte of the passed-in argument
177-
if (((uintptr_t)front % t->align) != 0) {
178-
front = (uint8_t *)align_to((uintptr_t)front, (size_t)t->align);
179-
}
180-
for (uintptr_t i = 0; i < t->size; ++front, ++i) {
181-
LOG(task, stdlib, " byte %" PRIdPTR ": 0x%" PRIx8, i, *front);
182-
}
183-
}
184-
185-
extern "C" CDECL void
186-
debug_box(type_desc *t, rust_opaque_box *box) {
187-
rust_task *task = rust_get_current_task();
188-
LOG(task, stdlib, "debug_box(0x%" PRIxPTR ")", box);
189-
debug_tydesc_helper(t);
190-
LOG(task, stdlib, " refcount %" PRIdPTR,
191-
box->ref_count - 1); // -1 because we ref'ed for this call
192-
uint8_t *data = (uint8_t *)box_body(box);
193-
for (uintptr_t i = 0; i < t->size; ++i) {
194-
LOG(task, stdlib, " byte %" PRIdPTR ": 0x%" PRIx8, i, data[i]);
195-
}
196-
}
197-
198-
struct rust_tag {
199-
uintptr_t discriminant;
200-
uint8_t variant[];
201-
};
202-
203-
extern "C" CDECL void
204-
debug_tag(type_desc *t, rust_tag *tag) {
205-
rust_task *task = rust_get_current_task();
206-
207-
LOG(task, stdlib, "debug_tag");
208-
debug_tydesc_helper(t);
209-
LOG(task, stdlib, " discriminant %" PRIdPTR, tag->discriminant);
210-
211-
for (uintptr_t i = 0; i < t->size - sizeof(tag->discriminant); ++i)
212-
LOG(task, stdlib, " byte %" PRIdPTR ": 0x%" PRIx8, i,
213-
tag->variant[i]);
214-
}
215-
216-
extern "C" CDECL void
217-
debug_fn(type_desc *t, fn_env_pair *fn) {
218-
rust_task *task = rust_get_current_task();
219-
LOG(task, stdlib, "debug_fn");
220-
debug_tydesc_helper(t);
221-
LOG(task, stdlib, " fn at 0x%" PRIxPTR, fn->f);
222-
LOG(task, stdlib, " env at 0x%" PRIxPTR, fn->env);
223-
if (fn->env) {
224-
LOG(task, stdlib, " refcount %" PRIdPTR, fn->env->ref_count);
225-
}
226-
}
227-
228-
extern "C" CDECL void *
229-
debug_ptrcast(type_desc *from_ty,
230-
type_desc *to_ty,
231-
void *ptr) {
232-
rust_task *task = rust_get_current_task();
233-
LOG(task, stdlib, "debug_ptrcast from");
234-
debug_tydesc_helper(from_ty);
235-
LOG(task, stdlib, "to");
236-
debug_tydesc_helper(to_ty);
237-
return ptr;
238-
}
239-
240153
extern "C" CDECL void *
241154
debug_get_stk_seg() {
242155
rust_task *task = rust_get_current_task();
@@ -583,11 +496,6 @@ rust_should_log_console() {
583496
return (uintptr_t)should_log_console();
584497
}
585498

586-
extern "C" CDECL void
587-
rust_dbg_breakpoint() {
588-
BREAKPOINT_AWESOME;
589-
}
590-
591499
extern "C" CDECL rust_sched_id
592500
rust_osmain_sched_id() {
593501
rust_task *task = rust_get_current_task();

‎branches/auto/src/rt/rust_debug.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,6 @@
1717
#include <string>
1818
#include <cstdlib>
1919

20-
#ifndef _WIN32
21-
22-
#include <signal.h>
23-
#define BREAKPOINT_AWESOME \
24-
do { \
25-
signal(SIGTRAP, SIG_IGN); \
26-
raise(SIGTRAP); \
27-
} while (0)
28-
29-
#else
30-
#define BREAKPOINT_AWESOME
31-
#endif
32-
3320
struct rust_task;
3421

3522
namespace debug {

‎branches/auto/src/rt/rustrt.def.in

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
debug_box
2-
debug_fn
3-
debug_opaque
4-
debug_ptrcast
5-
debug_tag
6-
debug_tydesc
71
debug_get_stk_seg
82
debug_abi_1
93
debug_abi_2
@@ -178,7 +172,6 @@ rust_dbg_lock_wait
178172
rust_dbg_lock_signal
179173
rust_dbg_call
180174
rust_dbg_do_nothing
181-
rust_dbg_breakpoint
182175
rust_osmain_sched_id
183176
rust_task_inhibit_kill
184177
rust_task_allow_kill

‎branches/auto/src/test/run-fail/morestack1.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test newsched transition
1211
// error-pattern:fail
1312
fn getbig(i: int) {
1413
if i != 0 {

‎branches/auto/src/test/run-fail/morestack2.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test newsched transition
1211
// error-pattern:explicit failure
1312

1413
// This time we're testing that the stack limits are restored

‎branches/auto/src/test/run-fail/morestack3.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test newsched transition
1211
// error-pattern:explicit failure
1312

1413
// Just testing unwinding

‎branches/auto/src/test/run-fail/morestack4.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test newsched transition
1211
// error-pattern:explicit failure
1312

1413
// Just testing unwinding

‎branches/auto/src/test/run-pass/morestack1.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test newsched transition
12-
1311
fn getbig(i: int) {
1412
if i != 0 {
1513
getbig(i - 1);

0 commit comments

Comments
 (0)