---

yaml
---
r: 63471
b: refs/heads/snap-stage3
c: fb2765e
h: refs/heads/master
i:
  63469: 55dff4d
  63467: 6eb2451
  63463: ab3ff0c
  63455: 0e9d430
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 7f55fc33f08a7ec5df0d06b4b0543bc864e60640
+refs/heads/snap-stage3: fb2765eebd33fbc0218c51313b629a079a09d9fc
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librusti/rusti.rc

@@ -538,8 +538,8 @@ mod tests {
 
     #[test]
     // FIXME: #7220 rusti on 32bit mac doesn't work.
-    #[cfg(not(and(target_word_size=32,
-                  target_os="mac")))]
+    #[cfg(not(target_word_size="32",
+              target_os="macos"))]
     fn run_all() {
         // FIXME(#7071):
         // By default, unit tests are run in parallel. Rusti, on the other hand,
@@ -652,8 +652,8 @@ mod tests {
 
     #[test]
     // FIXME: #7220 rusti on 32bit mac doesn't work.
-    #[cfg(not(and(target_word_size=32,
-                  target_os="mac")))]
+    #[cfg(not(target_word_size="32",
+              target_os="macos"))]
     fn exit_quits() {
         let mut r = repl();
         assert!(r.running);