diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-11-28 16:20:41 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-11-28 17:09:26 -0800 |
| commit | 65bd40e300323f1e4806dd84834b8d71bb89c08c (patch) | |
| tree | 53b9245b13ba9991627a0e23b8378a328af42ad4 /src/libsyntax/syntax.rc | |
| parent | 9b95d511316ae7124046de61d19335fdfaa021cc (diff) | |
| download | rust-65bd40e300323f1e4806dd84834b8d71bb89c08c.tar.gz rust-65bd40e300323f1e4806dd84834b8d71bb89c08c.zip | |
Remove uses of #[merge]
Diffstat (limited to 'src/libsyntax/syntax.rc')
| -rw-r--r-- | src/libsyntax/syntax.rc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/syntax.rc b/src/libsyntax/syntax.rc index d5a28a716ec..60036fe7737 100644 --- a/src/libsyntax/syntax.rc +++ b/src/libsyntax/syntax.rc @@ -44,7 +44,7 @@ mod util { mod interner; } -#[merge = "parse/mod.rs"] +#[path = "parse/mod.rs"] mod parse; mod print { @@ -118,8 +118,7 @@ mod ext { mod source_util; #[legacy_exports] - #[path = "ext/pipes.rs"] - #[merge = "ext/pipes/mod.rs"] + #[path = "ext/pipes/mod.rs"] mod pipes; #[legacy_exports] |