Skip to content

Commit e7efd33

Browse files
am0dam0d
committed
---
yaml --- r: 38899 b: refs/heads/incoming c: 062ac8c h: refs/heads/master i: 38897: 6bf746c 38895: 237122a v: v3
1 parent 1d2ea4c commit e7efd33

File tree

160 files changed

+1336
-1800
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+1336
-1800
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: 0fc952372a1010bc567b1c183105e4fd3f395af0
9+
refs/heads/incoming: 062ac8cb97fef80a370ef884c468c66c4c9d30e3
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/incoming/Makefile.in

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,16 @@ STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/, \
216216
# rustc crate variables
217217
######################################################################
218218

219-
COMPILER_CRATE := $(S)src/librustc/rustc.rc
220-
COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/librustc/, \
221-
rustc.rc *.rs */*.rs */*/*.rs */*/*/*.rs))
219+
COMPILER_CRATE := $(S)src/rustc/rustc.rc
220+
COMPILER_INPUTS := $(filter-out $(S)src/rustc/driver/rustc.rs, \
221+
$(wildcard $(addprefix $(S)src/rustc/, \
222+
rustc.rc *.rs */*.rs */*/*.rs */*/*/*.rs)))
222223

223224
LIBSYNTAX_CRATE := $(S)src/libsyntax/syntax.rc
224225
LIBSYNTAX_INPUTS := $(wildcard $(addprefix $(S)src/libsyntax/, \
225226
syntax.rc *.rs */*.rs */*/*.rs))
226227

227-
DRIVER_CRATE := $(S)src/driver/driver.rs
228+
RUSTC_INPUTS := $(S)src/rustc/driver/rustc.rs
228229

229230
######################################################################
230231
# LLVM macros
@@ -355,12 +356,7 @@ SREQ$(1)_T_$(2)_H_$(3) = \
355356
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
356357
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
357358
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB) \
358-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX) \
359-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC) \
360-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBFUZZER) \
361-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBCARGO) \
362-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC) \
363-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI) \
359+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
364360

365361
ifeq ($(1),0)
366362
# Don't run the the stage0 compiler under valgrind - that ship has sailed

‎branches/incoming/doc/tutorial.md

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,25 @@ match mypoint {
751751
}
752752
~~~
753753

754+
Structs are the only type in Rust that may have user-defined
755+
destructors, defined with `drop` blocks. Inside a `drop`, the name
756+
`self` refers to the struct's value.
757+
758+
~~~
759+
struct TimeBomb {
760+
explosivity: uint,
761+
762+
drop {
763+
for iter::repeat(self.explosivity) {
764+
io::println(fmt!("blam!"));
765+
}
766+
}
767+
}
768+
~~~
769+
770+
> ***Note***: This destructor syntax is temporary. Eventually destructors
771+
> will be defined for any type using [traits](#traits).
772+
754773
## Enums
755774

756775
Enums are datatypes that have several alternate representations. For
@@ -1890,8 +1909,8 @@ traits are automatically derived and implemented for all applicable
18901909
types by the compiler, and may not be overridden:
18911910

18921911
* `Copy` - Types that can be copied: either implicitly, or explicitly with the
1893-
`copy` operator. All types are copyable unless they have destructors or
1894-
contain types with destructors.
1912+
`copy` operator. All types are copyable unless they are classes
1913+
with destructors or otherwise contain classes with destructors.
18951914

18961915
* `Send` - Sendable (owned) types. All types are sendable unless they
18971916
contain managed boxes, managed closures, or otherwise managed
@@ -1903,28 +1922,6 @@ types by the compiler, and may not be overridden:
19031922
> ***Note:*** These three traits were referred to as 'kinds' in earlier
19041923
> iterations of the language, and often still are.
19051924
1906-
There is also a special trait known as `Drop`. This trait defines one method
1907-
called `finalize`, which is automatically called when value of the a type that
1908-
implements this trait is destroyed, either because the value went out of scope
1909-
or because the garbage collector reclaimed it.
1910-
1911-
~~~
1912-
struct TimeBomb {
1913-
explosivity: uint,
1914-
}
1915-
1916-
impl TimeBomb : Drop {
1917-
fn finalize() {
1918-
for iter::repeat(self.explosivity) {
1919-
io::println("blam!");
1920-
}
1921-
}
1922-
}
1923-
~~~
1924-
1925-
It is illegal to call `finalize` directly. Only code inserted by the compiler
1926-
may call it.
1927-
19281925
## Declaring and implementing traits
19291926

19301927
A trait consists of a set of methods, without bodies, or may be empty,

‎branches/incoming/mk/install.mk

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
4444
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
4545
$$(Q)$$(call INSTALL_LIB, \
4646
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB))
47-
$$(Q)$$(call INSTALL_LIB, \
48-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBFUZZER_GLOB))
49-
$$(Q)$$(call INSTALL_LIB, \
50-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBCARGO_GLOB))
51-
$$(Q)$$(call INSTALL_LIB, \
52-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTDOC_GLOB))
53-
$$(Q)$$(call INSTALL_LIB, \
54-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB))
5547
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
5648

5749
endef
@@ -80,20 +72,19 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
8072
$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
8173
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X))
8274
$(Q)$(call INSTALL,$(HB2),$(PHB),fuzzer$(X))
83-
$(Q)$(call INSTALL,$(HB2),$(PHB),cargo$(X))
84-
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
85-
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X))
86-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTC))
8775
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBFUZZER))
76+
$(Q)$(call INSTALL,$(HB2),$(PHB),cargo$(X))
8877
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBCARGO))
78+
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X))
79+
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
8980
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC))
9081
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTI))
82+
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
9183
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
9284
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
9385
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
9486
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB))
9587
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTI_GLOB))
96-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
9788
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
9889
$(Q)$(call INSTALL,$(S)/man, \
9990
$(PREFIX_ROOT)/share/man/man1,rustc.1)
@@ -109,11 +100,9 @@ uninstall:
109100
$(Q)rm -f $(PHB)/cargo$(X)
110101
$(Q)rm -f $(PHB)/rusti$(X)
111102
$(Q)rm -f $(PHB)/rustdoc$(X)
112-
$(Q)rm -f $(PHB)/fuzzer$(X)
113103
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM)
114104
$(Q)rm -f $(PHL)/$(CFG_LIBFUZZER)
115105
$(Q)rm -f $(PHL)/$(CFG_LIBCARGO)
116-
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTC)
117106
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC)
118107
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTI)
119108
$(Q)rm -f $(PHL)/$(CFG_RUNTIME)
@@ -122,9 +111,6 @@ uninstall:
122111
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \
123112
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \
124113
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB)) \
125-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBCARGO_GLOB)) \
126-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBFUZZER_GLOB)) \
127-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB)) \
128114
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB)) \
129115
; \
130116
do rm -f $$i ; \

‎branches/incoming/mk/target.mk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM): \
2424
@$$(call E, cp: $$@)
2525
$$(Q)cp $$< $$@
2626

27-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC): \
28-
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
29-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX)
30-
@$$(call E, compile_and_link: $$@)
31-
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
32-
33-
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X): \
34-
$$(DRIVER_CRATE) \
35-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
27+
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X): \
28+
$$(RUSTC_INPUTS) \
29+
$$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
3630
@$$(call E, compile_and_link: $$@)
37-
$$(STAGE$(1)_T_$(2)_H_$(3)) --cfg rustc -o $$@ $$<
31+
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$<
3832
ifdef CFG_ENABLE_PAX_FLAGS
3933
@$$(call E, apply PaX flags: $$@)
4034
@"$(CFG_PAXCTL)" -cm "$$@"
4135
endif
4236

37+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC): \
38+
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
39+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX)
40+
@$$(call E, compile_and_link: $$@)
41+
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
42+
4343
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX): \
4444
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
4545
$$(TSREQ$(1)_T_$(2)_H_$(3)) \

‎branches/incoming/mk/tools.mk

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Rules for non-core tools built with the compiler, both for target
22
# and host architectures
33

4+
TOOL_DRIVER := $(S)src/driver/driver.rs
5+
46
FUZZER_LIB := $(S)src/libfuzzer/fuzzer.rc
57
FUZZER_INPUTS := $(wildcard $(addprefix $(S)src/libfuzzer/, *.rs))
68

@@ -34,7 +36,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBFUZZER): \
3436
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
3537

3638
$$(TBIN$(1)_T_$(4)_H_$(3))/fuzzer$$(X): \
37-
$$(DRIVER_CRATE) \
39+
$$(TOOL_DRIVER) \
3840
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBFUZZER)
3941
@$$(call E, compile_and_link: $$@)
4042
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg fuzzer -o $$@ $$<
@@ -48,9 +50,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBFUZZER): \
4850
$$(HSREQ$(2)_H_$(4))
4951
@$$(call E, cp: $$@)
5052
$$(Q)cp $$< $$@
51-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBFUZZER_GLOB) \
52-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBFUZZER_DSYM_GLOB)) \
53-
$$(HLIB$(2)_H_$(4))
5453

5554
$$(HBIN$(2)_H_$(4))/fuzzer$$(X): \
5655
$$(TBIN$(1)_T_$(4)_H_$(3))/fuzzer$$(X) \
@@ -83,7 +82,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBCARGO): \
8382
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
8483

8584
$$(TBIN$(1)_T_$(4)_H_$(3))/cargo$$(X): \
86-
$$(DRIVER_CRATE) \
85+
$$(TOOL_DRIVER) \
8786
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBCARGO)
8887
@$$(call E, compile_and_link: $$@)
8988
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg cargo -o $$@ $$<
@@ -94,9 +93,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBCARGO): \
9493
$$(HSREQ$(2)_H_$(4))
9594
@$$(call E, cp: $$@)
9695
$$(Q)cp $$< $$@
97-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBCARGO_GLOB) \
98-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBCARGO_DSYM_GLOB)) \
99-
$$(HLIB$(2)_H_$(4))
10096

10197
$$(HBIN$(2)_H_$(4))/cargo$$(X): \
10298
$$(TBIN$(1)_T_$(4)_H_$(3))/cargo$$(X) \
@@ -115,7 +111,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTDOC): \
115111
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
116112

117113
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X): \
118-
$$(DRIVER_CRATE) \
114+
$$(TOOL_DRIVER) \
119115
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTDOC)
120116
@$$(call E, compile_and_link: $$@)
121117
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rustdoc -o $$@ $$<
@@ -126,9 +122,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTDOC): \
126122
$$(HSREQ$(2)_H_$(4))
127123
@$$(call E, cp: $$@)
128124
$$(Q)cp $$< $$@
129-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTDOC_GLOB) \
130-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTDOC_DSYM_GLOB)) \
131-
$$(HLIB$(2)_H_$(4))
132125

133126
$$(HBIN$(2)_H_$(4))/rustdoc$$(X): \
134127
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X) \
@@ -147,7 +140,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTI): \
147140
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
148141

149142
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X): \
150-
$$(DRIVER_CRATE) \
143+
$$(TOOL_DRIVER) \
151144
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTI)
152145
@$$(call E, compile_and_link: $$@)
153146
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rusti -o $$@ $$<
@@ -158,9 +151,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTI): \
158151
$$(HSREQ$(2)_H_$(4))
159152
@$$(call E, cp: $$@)
160153
$$(Q)cp $$< $$@
161-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTI_GLOB) \
162-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTI_DSYM_GLOB)) \
163-
$$(HLIB$(2)_H_$(4))
164154

165155
$$(HBIN$(2)_H_$(4))/rusti$$(X): \
166156
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X) \

‎branches/incoming/src/driver/driver.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,4 @@ extern mod self(name = "rustdoc", vers = "0.5");
1313
#[cfg(rusti)]
1414
extern mod self(name = "rusti", vers = "0.5");
1515

16-
#[cfg(rustc)]
17-
extern mod self(name = "rustc", vers = "0.5");
18-
1916
fn main() { self::main() }

‎branches/incoming/src/libcore/condition.rs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,18 @@ struct Guard<T, U:Copy> {
9696
mod test {
9797

9898
fn sadness_key(_x: @Handler<int,int>) { }
99-
const sadness_condition : Condition<int,int> =
100-
Condition { key: sadness_key };
101-
10299
fn trouble(i: int) {
100+
// Condition should work as a const, just limitations in consts.
101+
let sadness_condition : Condition<int,int> =
102+
Condition { key: sadness_key };
103103
debug!("trouble: raising conition");
104104
let j = sadness_condition.raise(&i);
105105
debug!("trouble: handler recovered with %d", j);
106106
}
107107

108108
fn nested_trap_test_inner() {
109+
let sadness_condition : Condition<int,int> =
110+
Condition { key: sadness_key };
109111

110112
let mut inner_trapped = false;
111113

@@ -124,6 +126,9 @@ mod test {
124126
#[test]
125127
fn nested_trap_test_outer() {
126128

129+
let sadness_condition : Condition<int,int> =
130+
Condition { key: sadness_key };
131+
127132
let mut outer_trapped = false;
128133

129134
do sadness_condition.trap(|_j| {
@@ -139,6 +144,8 @@ mod test {
139144
}
140145

141146
fn nested_reraise_trap_test_inner() {
147+
let sadness_condition : Condition<int,int> =
148+
Condition { key: sadness_key };
142149

143150
let mut inner_trapped = false;
144151

@@ -159,6 +166,9 @@ mod test {
159166
#[test]
160167
fn nested_reraise_trap_test_outer() {
161168

169+
let sadness_condition : Condition<int,int> =
170+
Condition { key: sadness_key };
171+
162172
let mut outer_trapped = false;
163173

164174
do sadness_condition.trap(|_j| {
@@ -174,6 +184,8 @@ mod test {
174184

175185
#[test]
176186
fn test_default() {
187+
let sadness_condition : Condition<int,int> =
188+
Condition { key: sadness_key };
177189

178190
let mut trapped = false;
179191

‎branches/incoming/src/libcore/core.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ pub use to_str::ToStr;
2828
#[cfg(notest)]
2929
pub use ops::{Const, Copy, Send, Owned};
3030
#[cfg(notest)]
31-
pub use ops::{Drop};
32-
#[cfg(notest)]
3331
pub use ops::{Add, Sub, Mul, Div, Modulo, Neg, BitAnd, BitOr, BitXor};
3432
#[cfg(notest)]
3533
pub use ops::{Shl, Shr, Index};
@@ -40,8 +38,6 @@ extern mod coreops(name = "core", vers = "0.5");
4038
#[cfg(test)]
4139
pub use coreops::ops::{Const, Copy, Send, Owned};
4240
#[cfg(test)]
43-
pub use coreops::ops::{Drop};
44-
#[cfg(test)]
4541
pub use coreops::ops::{Add, Sub, Mul, Div, Modulo, Neg, BitAnd, BitOr};
4642
#[cfg(test)]
4743
pub use coreops::ops::{BitXor};

0 commit comments

Comments
 (0)