---

yaml
---
r: 159273
b: refs/heads/master
c: d962fb0
h: refs/heads/master
i:
  159271: e0bebc4
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e94912aa853caff4b61bc08b7e3f574660673adc
+refs/heads/master: d962fb0ec82fe38b4a8915774f823e7802823b42
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9c96a79a74f10bed18b031ce0ac4126c56d6cfb3
 refs/heads/try: f58aad6dce273570fb130b4df008ef9acd5a5be2

trunk/mk/dist.mk

@@ -125,7 +125,7 @@ $(PKG_EXE): rust.iss modpath.iss upgrade.iss LICENSE.txt rust-logo.ico \
             dist-prepare-win
 	$(CFG_PYTHON) $(S)src/etc/make-win-dist.py tmp/dist/win $(CFG_BUILD)
 	@$(call E, ISCC: $@)
-	$(Q)"$(CFG_ISCC)" $<
+	$(Q)$(CFG_ISCC) $<
 
 $(eval $(call DEF_PREPARE,win))
 

trunk/mk/main.mk

@@ -52,7 +52,7 @@ CFG_GIT_DIR := $(CFG_SRC_DIR).git
 # so we use a hack: define $(SPACE) which contains space character.
 SPACE :=
 SPACE +=
-ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT))),)
+ifneq ($(CFG_GIT),)
 ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),)
     CFG_VER_DATE = $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 --pretty=format:'%ci')
     CFG_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse HEAD)

trunk/src/libcollections/enum_set.rs

@@ -486,7 +486,7 @@ mod test {
                 unsafe { mem::transmute(v) }
             }
         }
-        let mut set = EnumSet::empty();
-        set.add(V64);
+        let mut set = EnumSet::new();
+        set.insert(V64);
     }
 }