---

yaml
---
r: 137702
b: refs/heads/auto
c: 9c09c94
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 01d58fe2cbad0872f92571960ca3d8a5b01d0784
+refs/heads/auto: 9c09c9434764127f857a9599b93dc090ac63cc2b
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libsyntax/ext/bytes.rs

@@ -104,19 +104,14 @@ pub fn expand_syntax_ext<'cx>(cx: &'cx mut ExtCtxt,
         return DummyResult::expr(sp);
     }
 
-    let e = cx.expr_vec_slice(sp, bytes);
-    let ty = cx.ty(sp, ast::TyVec(cx.ty_ident(sp, cx.ident_of("u8"))));
-    let lifetime = cx.lifetime(sp, cx.ident_of("'static").name);
-    let item = cx.item_static(sp,
-                              cx.ident_of("BYTES"),
-                              cx.ty_rptr(sp,
-                                         ty,
-                                         Some(lifetime),
-                                         ast::MutImmutable),
-                              ast::MutImmutable,
-                              e);
-    let e = cx.expr_block(cx.block(sp,
-                                   vec!(cx.stmt_item(sp, item)),
-                                   Some(cx.expr_ident(sp, cx.ident_of("BYTES")))));
+    let len = bytes.len();
+    let e = cx.expr_vec(sp, bytes);
+    let ty = cx.ty(sp, ast::TyFixedLengthVec(cx.ty_ident(sp, cx.ident_of("u8")),
+                                             cx.expr_uint(sp, len)));
+    let item = cx.item_static(sp, cx.ident_of("BYTES"), ty, ast::MutImmutable, e);
+    let ret = cx.expr_ident(sp, cx.ident_of("BYTES"));
+    let ret = cx.expr_addr_of(sp, ret);
+    let e = cx.expr_block(cx.block(sp, vec![cx.stmt_item(sp, item)],
+                                   Some(ret)));
     MacExpr::new(e)
 }