about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-07-28 20:34:29 -0700
committerbors <bors@rust-lang.org>2013-07-28 20:34:29 -0700
commit27812ea5e025ed36dc80379b86bb249b33c528a2 (patch)
treed70ce8e8d3067076d66a4e6458cd6cfd1e439398 /src/libsyntax
parent52dbe138cfd462f443fe209bcab12de418786e45 (diff)
parent1493141bfdb478c42fb073ef6872540de3b125f0 (diff)
downloadrust-27812ea5e025ed36dc80379b86bb249b33c528a2.tar.gz
rust-27812ea5e025ed36dc80379b86bb249b33c528a2.zip
auto merge of #8091 : kevinmehall/rust/const-struct-base, r=alexcrichton
With an expression like

    static w : foo = foo { a:5, ..x };

Rust currently gives the error "constant contains unimplemented expression type". This branch implements support for constant structs with `..base`.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ast.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 470e05223db..51c47acff0e 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -498,7 +498,7 @@ pub enum expr_ {
     expr_mac(mac),
 
     // A struct literal expression.
-    expr_struct(Path, ~[Field], Option<@expr>),
+    expr_struct(Path, ~[Field], Option<@expr> /* base */),
 
     // A vector literal constructed from one repeated element.
     expr_repeat(@expr /* element */, @expr /* count */, mutability),