Skip to content

Commit 65bd40e

Browse files
committed
Remove uses of #[merge]
1 parent 9b95d51 commit 65bd40e

File tree

17 files changed

+2614
-2607
lines changed

17 files changed

+2614
-2607
lines changed

src/libcore/core.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ pub mod send_map;
144144

145145
// Concurrency
146146
pub mod comm;
147-
#[merge = "task/mod.rs"]
147+
#[path = "task/mod.rs"]
148148
pub mod task;
149149
pub mod pipes;
150150

0 commit comments

Comments
 (0)