Skip to content

Commit c8f5615

Browse files
committed
---
yaml --- r: 56378 b: refs/heads/auto c: 212256b h: refs/heads/master v: v3
1 parent 47f488f commit c8f5615

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
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: 54b0cbf86eeb36c1d6d472d5e237ba2894cf401d
17+
refs/heads/auto: 212256b1a0c8bbe1d442d98afbf891b9ea33f13f
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/rt/rust_task.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -396,12 +396,6 @@ rust_task : public kernel_owned<rust_task>
396396
void allow_yield();
397397
};
398398

399-
// FIXME (#2697): It would be really nice to be able to get rid of this.
400-
inline void *operator new[](size_t size, rust_task *task, const char *tag) {
401-
return task->malloc(size, tag);
402-
}
403-
404-
405399
template <typename T> struct task_owned {
406400
inline void *operator new(size_t size, rust_task *task,
407401
const char *tag) {

0 commit comments

Comments
 (0)