Skip to content

Commit ac61c51

Browse files
author
James Miller
committed
---
yaml --- r: 60074 b: refs/heads/master c: 0addefa h: refs/heads/master v: v3
1 parent f011c72 commit ac61c51

File tree

18 files changed

+146
-90
lines changed

18 files changed

+146
-90
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: d8ef723d490a8c98a4324a850a629e476011faf4
2+
refs/heads/master: 0addefa68a85974a0b3906e7a46376a98ad513cc
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
55
refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

‎trunk/mk/host.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,10 @@ $$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)): \
130130
$$(HBIN$(2)_H_$(4))/:
131131
mkdir -p $$@
132132

133+
ifneq ($(CFG_LIBDIR),bin)
133134
$$(HLIB$(2)_H_$(4))/:
134135
mkdir -p $$@
136+
endif
135137

136138
endef
137139

‎trunk/mk/install.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ ifeq ($(CFG_ADB_DEVICE_STATUS),true)
192192
ifdef VERBOSE
193193
ADB = adb $(1)
194194
ADB_PUSH = adb push $(1) $(2)
195-
ADB_SHELL = adb shell $(1) $(2)
195+
ADB_SHELL = adb shell $(1) $(2)
196196
else
197-
ADB = $(Q)$(call E, adb $(1)) && adb $(1) 1>/dev/null
197+
ADB = $(Q)$(call E, adb $(1)) && adb $(1) 1>/dev/null
198198
ADB_PUSH = $(Q)$(call E, adb push $(1)) && adb push $(1) $(2) 1>/dev/null
199199
ADB_SHELL = $(Q)$(call E, adb shell $(1) $(2)) && adb shell $(1) $(2) 1>/dev/null
200200
endif
@@ -222,8 +222,8 @@ install-runtime-target: \
222222
install-runtime-target-arm-linux-androideabi-cleanup \
223223
install-runtime-target-arm-linux-androideabi-host-$(CFG_BUILD_TRIPLE)
224224
else
225-
install-runtime-target:
225+
install-runtime-target:
226226
@echo "No device to install runtime library"
227-
@echo
227+
@echo
228228
endif
229229
endif

‎trunk/mk/rt.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ endif
163163
ifdef CFG_WINDOWSY_$(1)
164164
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
165165
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
166-
CFLAGS="$$(CFG_GCCISH_CFLAGS)" \
167-
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS)" \
168166
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
169167
OS=mingw \
170168
V=$$(VERBOSE)

‎trunk/mk/target.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,10 @@ endif
8686
$$(TBIN$(1)_T_$(2)_H_$(3))/:
8787
mkdir -p $$@
8888

89+
ifneq ($(CFG_LIBDIR),bin)
8990
$$(TLIB$(1)_T_$(2)_H_$(3))/:
9091
mkdir -p $$@
92+
endif
9193

9294
endef
9395

‎trunk/mk/tests.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ endef
9292
$(foreach target,$(CFG_TARGET_TRIPLES), \
9393
$(eval $(call DEF_TARGET_COMMANDS,$(target))))
9494

95-
# Target platform specific variables
95+
# Target platform specific variables
9696
# for arm-linux-androidabi
9797
define DEF_ADB_DEVICE_STATUS
9898
CFG_ADB_DEVICE_STATUS=$(1)
@@ -402,7 +402,7 @@ $(foreach host,$(CFG_HOST_TRIPLES), \
402402
$(eval $(call DEF_TEST_CRATE_RULES_null,$(stage),$(target),$(host),$(crate))) \
403403
), \
404404
$(eval $(call DEF_TEST_CRATE_RULES,$(stage),$(target),$(host),$(crate))) \
405-
))))))
405+
))))))
406406

407407

408408
######################################################################

‎trunk/src/etc/vim/indent/rust.vim

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ if exists("b:did_indent")
55
endif
66

77
let b:did_indent = 1
8-
setlocal smartindent
8+
9+
setlocal cindent
10+
setlocal cinoptions=L0,(0,Ws,JN
11+
setlocal cinkeys=0{,0},!^F,o,O

‎trunk/src/libcore/hashmap.rs

Lines changed: 75 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,27 @@ impl<K:Hash + Eq,V> Map<K, V> for HashMap<K, V> {
352352
}
353353
354354
/// Return a mutable reference to the value corresponding to the key
355+
#[cfg(stage0)]
355356
fn find_mut<'a>(&'a mut self, k: &K) -> Option<&'a mut V> {
356357
let idx = match self.bucket_for_key(k) {
357358
FoundEntry(idx) => idx,
358359
TableFull | FoundHole(_) => return None
359360
};
360-
unsafe { // FIXME(#4903)---requires flow-sensitive borrow checker
361+
unsafe {
361362
Some(::cast::transmute_mut_region(self.mut_value_for_bucket(idx)))
362363
}
363364
}
364365
366+
/// Return a mutable reference to the value corresponding to the key
367+
#[cfg(not(stage0))]
368+
fn find_mut<'a>(&'a mut self, k: &K) -> Option<&'a mut V> {
369+
let idx = match self.bucket_for_key(k) {
370+
FoundEntry(idx) => idx,
371+
TableFull | FoundHole(_) => return None
372+
};
373+
Some(self.mut_value_for_bucket(idx))
374+
}
375+
365376
/// Insert a key-value pair into the map. An existing value for a
366377
/// key is replaced by the new value. Return true if the key did
367378
/// not already exist in the map.
@@ -424,6 +435,7 @@ pub impl<K: Hash + Eq, V> HashMap<K, V> {
424435
425436
/// Return the value corresponding to the key in the map, or insert
426437
/// and return the value if it doesn't exist.
438+
#[cfg(stage0)]
427439
fn find_or_insert<'a>(&'a mut self, k: K, v: V) -> &'a V {
428440
if self.size >= self.resize_at {
429441
// n.b.: We could also do this after searching, so
@@ -447,13 +459,43 @@ pub impl<K: Hash + Eq, V> HashMap<K, V> {
447459
},
448460
};
449461
450-
unsafe { // FIXME(#4903)---requires flow-sensitive borrow checker
462+
unsafe {
451463
::cast::transmute_region(self.value_for_bucket(idx))
452464
}
453465
}
454466
467+
/// Return the value corresponding to the key in the map, or insert
468+
/// and return the value if it doesn't exist.
469+
#[cfg(not(stage0))]
470+
fn find_or_insert<'a>(&'a mut self, k: K, v: V) -> &'a V {
471+
if self.size >= self.resize_at {
472+
// n.b.: We could also do this after searching, so
473+
// that we do not resize if this call to insert is
474+
// simply going to update a key in place. My sense
475+
// though is that it's worse to have to search through
476+
// buckets to find the right spot twice than to just
477+
// resize in this corner case.
478+
self.expand();
479+
}
480+
481+
let hash = k.hash_keyed(self.k0, self.k1) as uint;
482+
let idx = match self.bucket_for_key_with_hash(hash, &k) {
483+
TableFull => fail!(~"Internal logic error"),
484+
FoundEntry(idx) => idx,
485+
FoundHole(idx) => {
486+
self.buckets[idx] = Some(Bucket{hash: hash, key: k,
487+
value: v});
488+
self.size += 1;
489+
idx
490+
},
491+
};
492+
493+
self.value_for_bucket(idx)
494+
}
495+
455496
/// Return the value corresponding to the key in the map, or create,
456497
/// insert, and return a new value if it doesn't exist.
498+
#[cfg(stage0)]
457499
fn find_or_insert_with<'a>(&'a mut self, k: K, f: &fn(&K) -> V) -> &'a V {
458500
if self.size >= self.resize_at {
459501
// n.b.: We could also do this after searching, so
@@ -478,11 +520,41 @@ pub impl<K: Hash + Eq, V> HashMap<K, V> {
478520
},
479521
};
480522
481-
unsafe { // FIXME(#4903)---requires flow-sensitive borrow checker
523+
unsafe {
482524
::cast::transmute_region(self.value_for_bucket(idx))
483525
}
484526
}
485527
528+
/// Return the value corresponding to the key in the map, or create,
529+
/// insert, and return a new value if it doesn't exist.
530+
#[cfg(not(stage0))]
531+
fn find_or_insert_with<'a>(&'a mut self, k: K, f: &fn(&K) -> V) -> &'a V {
532+
if self.size >= self.resize_at {
533+
// n.b.: We could also do this after searching, so
534+
// that we do not resize if this call to insert is
535+
// simply going to update a key in place. My sense
536+
// though is that it's worse to have to search through
537+
// buckets to find the right spot twice than to just
538+
// resize in this corner case.
539+
self.expand();
540+
}
541+
542+
let hash = k.hash_keyed(self.k0, self.k1) as uint;
543+
let idx = match self.bucket_for_key_with_hash(hash, &k) {
544+
TableFull => fail!(~"Internal logic error"),
545+
FoundEntry(idx) => idx,
546+
FoundHole(idx) => {
547+
let v = f(&k);
548+
self.buckets[idx] = Some(Bucket{hash: hash, key: k,
549+
value: v});
550+
self.size += 1;
551+
idx
552+
},
553+
};
554+
555+
self.value_for_bucket(idx)
556+
}
557+
486558
fn consume(&mut self, f: &fn(K, V)) {
487559
let mut buckets = ~[];
488560
self.buckets <-> buckets;

‎trunk/src/libcore/task/local_data.rs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub type LocalDataKey<'self,T> = &'self fn(v: @T);
4949
* Remove a task-local data value from the table, returning the
5050
* reference that was originally created to insert it.
5151
*/
52-
pub unsafe fn local_data_pop<T: 'static>(
52+
pub unsafe fn local_data_pop<T:Durable>(
5353
key: LocalDataKey<T>) -> Option<@T> {
5454

5555
local_pop(Handle::new(), key)
@@ -58,7 +58,7 @@ pub unsafe fn local_data_pop<T: 'static>(
5858
* Retrieve a task-local data value. It will also be kept alive in the
5959
* table until explicitly removed.
6060
*/
61-
pub unsafe fn local_data_get<T: 'static>(
61+
pub unsafe fn local_data_get<T:Durable>(
6262
key: LocalDataKey<T>) -> Option<@T> {
6363

6464
local_get(Handle::new(), key)
@@ -67,7 +67,7 @@ pub unsafe fn local_data_get<T: 'static>(
6767
* Store a value in task-local data. If this key already has a value,
6868
* that value is overwritten (and its destructor is run).
6969
*/
70-
pub unsafe fn local_data_set<T: 'static>(
70+
pub unsafe fn local_data_set<T:Durable>(
7171
key: LocalDataKey<T>, data: @T) {
7272

7373
local_set(Handle::new(), key, data)
@@ -76,7 +76,7 @@ pub unsafe fn local_data_set<T: 'static>(
7676
* Modify a task-local data value. If the function returns 'None', the
7777
* data is removed (and its reference dropped).
7878
*/
79-
pub unsafe fn local_data_modify<T: 'static>(
79+
pub unsafe fn local_data_modify<T:Durable>(
8080
key: LocalDataKey<T>,
8181
modify_fn: &fn(Option<@T>) -> Option<@T>) {
8282

@@ -215,12 +215,3 @@ fn test_tls_cleanup_on_failure() {
215215
fail!();
216216
}
217217
}
218-
219-
#[test]
220-
fn test_static_pointer() {
221-
unsafe {
222-
fn key(_x: @&'static int) { }
223-
static VALUE: int = 0;
224-
local_data_set(key, @&VALUE);
225-
}
226-
}

‎trunk/src/libcore/task/local_data_priv.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl Handle {
4444
}
4545

4646
pub trait LocalData { }
47-
impl<T: 'static> LocalData for @T { }
47+
impl<T:Durable> LocalData for @T { }
4848

4949
impl Eq for @LocalData {
5050
fn eq(&self, other: &@LocalData) -> bool {
@@ -131,15 +131,15 @@ unsafe fn get_newsched_local_map(local: *mut LocalStorage) -> TaskLocalMap {
131131
}
132132
}
133133

134-
unsafe fn key_to_key_value<T: 'static>(key: LocalDataKey<T>) -> *libc::c_void {
134+
unsafe fn key_to_key_value<T:Durable>(key: LocalDataKey<T>) -> *libc::c_void {
135135
// Keys are closures, which are (fnptr,envptr) pairs. Use fnptr.
136136
// Use reintepret_cast -- transmute would leak (forget) the closure.
137137
let pair: (*libc::c_void, *libc::c_void) = cast::transmute_copy(&key);
138138
pair.first()
139139
}
140140

141141
// If returning Some(..), returns with @T with the map's reference. Careful!
142-
unsafe fn local_data_lookup<T: 'static>(
142+
unsafe fn local_data_lookup<T:Durable>(
143143
map: TaskLocalMap, key: LocalDataKey<T>)
144144
-> Option<(uint, *libc::c_void)> {
145145

@@ -157,7 +157,7 @@ unsafe fn local_data_lookup<T: 'static>(
157157
}
158158
}
159159

160-
unsafe fn local_get_helper<T: 'static>(
160+
unsafe fn local_get_helper<T:Durable>(
161161
handle: Handle, key: LocalDataKey<T>,
162162
do_pop: bool) -> Option<@T> {
163163

@@ -179,21 +179,21 @@ unsafe fn local_get_helper<T: 'static>(
179179
}
180180

181181

182-
pub unsafe fn local_pop<T: 'static>(
182+
pub unsafe fn local_pop<T:Durable>(
183183
handle: Handle,
184184
key: LocalDataKey<T>) -> Option<@T> {
185185

186186
local_get_helper(handle, key, true)
187187
}
188188

189-
pub unsafe fn local_get<T: 'static>(
189+
pub unsafe fn local_get<T:Durable>(
190190
handle: Handle,
191191
key: LocalDataKey<T>) -> Option<@T> {
192192

193193
local_get_helper(handle, key, false)
194194
}
195195

196-
pub unsafe fn local_set<T: 'static>(
196+
pub unsafe fn local_set<T:Durable>(
197197
handle: Handle, key: LocalDataKey<T>, data: @T) {
198198

199199
let map = get_local_map(handle);
@@ -225,7 +225,7 @@ pub unsafe fn local_set<T: 'static>(
225225
}
226226
}
227227

228-
pub unsafe fn local_modify<T: 'static>(
228+
pub unsafe fn local_modify<T:Durable>(
229229
handle: Handle, key: LocalDataKey<T>,
230230
modify_fn: &fn(Option<@T>) -> Option<@T>) {
231231

‎trunk/src/libcore/trie.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,9 @@ fn chunk(n: uint, idx: uint) -> uint {
289289
(n >> sh) & MASK
290290
}
291291

292-
fn find_mut<'r, T>(child: &'r mut Child<T>, key: uint, idx: uint)
293-
-> Option<&'r mut T> {
294-
unsafe { // FIXME(#4903)---requires flow-sensitive borrow checker
292+
#[cfg(stage0)]
293+
fn find_mut<'r, T>(child: &'r mut Child<T>, key: uint, idx: uint) -> Option<&'r mut T> {
294+
unsafe {
295295
(match *child {
296296
External(_, ref value) => Some(cast::transmute_mut(value)),
297297
Internal(ref x) => find_mut(cast::transmute_mut(&x.children[chunk(key, idx)]),
@@ -301,6 +301,15 @@ fn find_mut<'r, T>(child: &'r mut Child<T>, key: uint, idx: uint)
301301
}
302302
}
303303

304+
#[cfg(not(stage0))]
305+
fn find_mut<'r, T>(child: &'r mut Child<T>, key: uint, idx: uint) -> Option<&'r mut T> {
306+
match *child {
307+
External(_, ref mut value) => Some(value),
308+
Internal(ref mut x) => find_mut(&mut x.children[chunk(key, idx)], key, idx + 1),
309+
Nothing => None
310+
}
311+
}
312+
304313
fn insert<T>(count: &mut uint, child: &mut Child<T>, key: uint, value: T,
305314
idx: uint) -> Option<T> {
306315
let mut tmp = Nothing;

0 commit comments

Comments
 (0)