diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2015-05-05 08:47:04 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2015-05-21 11:47:30 -0400 |
| commit | df93deab10850d52252829770895b0249b0d7f1e (patch) | |
| tree | 4e8a7657c0d2714319800a07c485bff473043bad /src/libsyntax/ext | |
| parent | fb206bf34a2463317b9fa1ef3c0ff35d921f8920 (diff) | |
| download | rust-df93deab10850d52252829770895b0249b0d7f1e.tar.gz rust-df93deab10850d52252829770895b0249b0d7f1e.zip | |
Make various fixes:
- add feature gate - add basic tests - adjust parser to eliminate conflict between `const fn` and associated constants - allow `const fn` in traits/trait-impls, but forbid later in type check - correct some merge conflicts
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 912cc841a64..5f0efd14eec 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1396,6 +1396,7 @@ fn expand_and_rename_method(sig: ast::MethodSig, body: P<ast::Block>, abi: sig.abi, explicit_self: fld.fold_explicit_self(sig.explicit_self), unsafety: sig.unsafety, + constness: sig.constness, decl: rewritten_fn_decl }, rewritten_body) } |