Skip to content

Commit 5181ea7

Browse files
brsonbrson
committed
---
yaml --- r: 36794 b: refs/heads/try2 c: 33a8f85 h: refs/heads/master v: v3
1 parent c703ecf commit 5181ea7

File tree

8 files changed

+14
-87
lines changed

8 files changed

+14
-87
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 5ff99c27d05322afffbee827d13a6a226430521c
8+
refs/heads/try2: 33a8f855c2c647079d69e0b2c83dd1737b539f70
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

‎branches/try2/src/librustc/rustc.rc

Lines changed: 2 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -53,174 +53,121 @@ mod middle {
5353
mod trans {
5454
#[legacy_exports];
5555
#[legacy_exports]
56-
#[path = "middle/trans/inline.rs"]
5756
mod inline;
5857
#[legacy_exports]
59-
#[path = "middle/trans/monomorphize.rs"]
6058
mod monomorphize;
6159
#[legacy_exports]
62-
#[path = "middle/trans/controlflow.rs"]
6360
mod controlflow;
6461
#[legacy_exports]
65-
#[path = "middle/trans/glue.rs"]
6662
mod glue;
6763
#[legacy_exports]
68-
#[path = "middle/trans/datum.rs"]
6964
mod datum;
7065
#[legacy_exports]
71-
#[path = "middle/trans/callee.rs"]
7266
mod callee;
7367
#[legacy_exports]
74-
#[path = "middle/trans/expr.rs"]
7568
mod expr;
7669
#[legacy_exports]
77-
#[path = "middle/trans/common.rs"]
7870
mod common;
7971
#[legacy_exports]
80-
#[path = "middle/trans/consts.rs"]
8172
mod consts;
8273
#[legacy_exports]
83-
#[path = "middle/trans/type_of.rs"]
8474
mod type_of;
8575
#[legacy_exports]
86-
#[path = "middle/trans/build.rs"]
8776
mod build;
8877
#[legacy_exports]
89-
#[path = "middle/trans/base.rs"]
9078
mod base;
9179
#[legacy_exports]
92-
#[path = "middle/trans/alt.rs"]
9380
mod alt;
9481
#[legacy_exports]
95-
#[path = "middle/trans/uniq.rs"]
9682
mod uniq;
9783
#[legacy_exports]
98-
#[path = "middle/trans/closure.rs"]
9984
mod closure;
10085
#[legacy_exports]
101-
#[path = "middle/trans/tvec.rs"]
10286
mod tvec;
10387
#[legacy_exports]
104-
#[path = "middle/trans/meth.rs"]
10588
mod meth;
10689
#[legacy_exports]
107-
#[path = "middle/trans/foreign.rs"]
10890
mod foreign;
10991
#[legacy_exports]
110-
#[path = "middle/trans/reflect.rs"]
11192
mod reflect;
11293
#[legacy_exports]
113-
#[path = "middle/trans/shape.rs"]
11494
mod shape;
11595
#[legacy_exports]
116-
#[path = "middle/trans/debuginfo.rs"]
11796
mod debuginfo;
11897
#[legacy_exports]
119-
#[path = "middle/trans/type_use.rs"]
12098
mod type_use;
12199
#[legacy_exports]
122-
#[path = "middle/trans/reachable.rs"]
123100
mod reachable;
124-
#[path = "middle/trans/machine.rs"]
125101
mod machine;
126102
}
127103
#[legacy_exports]
128-
#[path = "middle/ty.rs"]
129104
mod ty;
130105
#[legacy_exports]
131-
#[path = "middle/resolve.rs"]
132106
mod resolve;
133-
#[path = "middle/typeck/mod.rs"]
107+
#[path2 = "typeck/mod.rs"]
134108
pub mod typeck;
135109
#[legacy_exports]
136-
#[path = "middle/check_loop.rs"]
137110
mod check_loop;
138111
#[legacy_exports]
139-
#[path = "middle/check_alt.rs"]
140112
mod check_alt;
141113
#[legacy_exports]
142-
#[path = "middle/check_const.rs"]
143114
mod check_const;
144115
#[legacy_exports]
145-
#[path = "middle/lint.rs"]
146116
mod lint;
147-
#[path = "middle/borrowck/mod.rs"]
117+
#[path2 = "borrowck/mod.rs"]
148118
pub mod borrowck;
149119
#[legacy_exports]
150-
#[path = "middle/mem_categorization.rs"]
151120
mod mem_categorization;
152121
#[legacy_exports]
153-
#[path = "middle/liveness.rs"]
154122
mod liveness;
155123
#[legacy_exports]
156-
#[path = "middle/kind.rs"]
157124
mod kind;
158125
#[legacy_exports]
159-
#[path = "middle/freevars.rs"]
160126
mod freevars;
161127
#[legacy_exports]
162-
#[path = "middle/capture.rs"]
163128
mod capture;
164129
#[legacy_exports]
165-
#[path = "middle/pat_util.rs"]
166130
mod pat_util;
167131
#[legacy_exports]
168-
#[path = "middle/region.rs"]
169132
mod region;
170133
#[legacy_exports]
171-
#[path = "middle/const_eval.rs"]
172134
mod const_eval;
173135
#[legacy_exports]
174-
#[path = "middle/astencode.rs"]
175136
mod astencode;
176137
#[legacy_exports]
177-
#[path = "middle/lang_items.rs"]
178138
mod lang_items;
179139
#[legacy_exports]
180-
#[path = "middle/privacy.rs"]
181140
mod privacy;
182-
#[path = "middle/mode.rs"]
183141
mod mode;
184142
}
185143

186144
mod front {
187145
#[legacy_exports];
188146
#[legacy_exports]
189-
#[path = "front/config.rs"]
190147
mod config;
191148
#[legacy_exports]
192-
#[path = "front/test.rs"]
193149
mod test;
194150
#[legacy_exports]
195-
#[path = "front/core_inject.rs"]
196151
mod core_inject;
197152
#[legacy_exports]
198-
#[path = "front/intrinsic_inject.rs"]
199153
mod intrinsic_inject;
200154
}
201155

202156
mod back {
203157
#[legacy_exports];
204158
#[legacy_exports]
205-
#[path = "back/link.rs"]
206159
mod link;
207160
#[legacy_exports]
208-
#[path = "back/abi.rs"]
209161
mod abi;
210162
#[legacy_exports]
211-
#[path = "back/upcall.rs"]
212163
mod upcall;
213164
#[legacy_exports]
214-
#[path = "back/x86.rs"]
215165
mod x86;
216166
#[legacy_exports]
217-
#[path = "back/x86_64.rs"]
218167
mod x86_64;
219168
#[legacy_exports]
220-
#[path = "back/rpath.rs"]
221169
mod rpath;
222170
#[legacy_exports]
223-
#[path = "back/target_strs.rs"]
224171
mod target_strs;
225172
}
226173

@@ -233,17 +180,14 @@ mod driver;
233180
mod util {
234181
#[legacy_exports];
235182
#[legacy_exports]
236-
#[path = "util/common.rs"]
237183
mod common;
238184
#[legacy_exports]
239-
#[path = "util/ppaux.rs"]
240185
mod ppaux;
241186
}
242187

243188
mod lib {
244189
#[legacy_exports];
245190
#[legacy_exports]
246-
#[path = "lib/llvm.rs"]
247191
mod llvm;
248192
}
249193

‎branches/try2/src/libsyntax/parse/parser.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,7 +3018,7 @@ impl Parser {
30183018
fn push_mod_path(id: ident, attrs: ~[ast::attribute]) {
30193019
let default_path = self.sess.interner.get(id);
30203020
let file_path = match ::attr::first_attr_value_str_by_name(
3021-
attrs, ~"path2") {
3021+
attrs, ~"path") {
30223022
30233023
Some(ref d) => (*d),
30243024
None => copy *default_path
@@ -3038,13 +3038,14 @@ impl Parser {
30383038
let prefix = prefix.dir_path();
30393039
let mod_path = Path(".").push_many(self.mod_path_stack);
30403040
let default_path = self.sess.interner.get(id) + ~".rs";
3041+
// XXX path2 and path are synonyms. Remove path2 after snapshot
30413042
let file_path = match ::attr::first_attr_value_str_by_name(
30423043
outer_attrs, ~"path2") {
30433044
30443045
Some(ref d) => mod_path.push(*d),
30453046
None => match ::attr::first_attr_value_str_by_name(
30463047
outer_attrs, ~"path") {
3047-
Some(ref d) => Path(*d),
3048+
Some(ref d) => mod_path.push(*d),
30483049
None => mod_path.push(default_path)
30493050
}
30503051
};

‎branches/try2/src/libsyntax/syntax.rc

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ mod fold;
5555
mod util {
5656
#[legacy_exports];
5757
#[legacy_exports]
58-
#[path = "util/interner.rs"]
58+
#[path2 = "interner.rs"]
5959
mod interner;
6060
}
6161

@@ -65,72 +65,54 @@ mod parse;
6565
mod print {
6666
#[legacy_exports];
6767
#[legacy_exports]
68-
#[path = "print/pp.rs"]
6968
mod pp;
7069
#[legacy_exports]
71-
#[path = "print/pprust.rs"]
7270
mod pprust;
7371
}
7472

7573
mod ext {
7674
#[legacy_exports];
7775
#[legacy_exports]
78-
#[path = "ext/base.rs"]
7976
mod base;
8077
#[legacy_exports]
81-
#[path = "ext/expand.rs"]
8278
mod expand;
8379

84-
#[path = "ext/quote.rs"]
8580
mod quote;
86-
#[path = "ext/deriving.rs"]
8781
mod deriving;
8882

8983
#[legacy_exports]
90-
#[path = "ext/build.rs"]
9184
mod build;
9285

9386
mod tt {
9487
#[legacy_exports];
9588
#[legacy_exports]
96-
#[path = "ext/tt/transcribe.rs"]
9789
mod transcribe;
9890
#[legacy_exports]
99-
#[path = "ext/tt/macro_parser.rs"]
10091
mod macro_parser;
10192
#[legacy_exports]
102-
#[path = "ext/tt/macro_rules.rs"]
10393
mod macro_rules;
10494
}
10595

10696

10797
#[legacy_exports]
108-
#[path = "ext/fmt.rs"]
10998
mod fmt;
11099
#[legacy_exports]
111-
#[path = "ext/env.rs"]
112100
mod env;
113101
#[legacy_exports]
114-
#[path = "ext/concat_idents.rs"]
115102
mod concat_idents;
116103
#[legacy_exports]
117-
#[path = "ext/log_syntax.rs"]
118104
mod log_syntax;
119105
#[legacy_exports]
120-
#[path = "ext/auto_encode.rs"]
121106
mod auto_encode;
122107
#[legacy_exports]
123-
#[path = "ext/auto_serialize.rs"]
124108
mod auto_serialize;
125109
#[legacy_exports]
126-
#[path = "ext/source_util.rs"]
127110
mod source_util;
128111

129112
#[legacy_exports]
130-
#[path = "ext/pipes/mod.rs"]
113+
#[path2 = "pipes/mod.rs"]
131114
mod pipes;
132115

133116
#[legacy_exports]
134-
#[path = "ext/trace_macros.rs"]
135117
mod trace_macros;
136118
}

‎branches/try2/src/test/run-pass/mod_dir_path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// xfail-fast
1313

1414
mod mod_dir_simple {
15-
#[path2 = "test.rs"]
15+
#[path = "test.rs"]
1616
pub mod syrup;
1717
}
1818

‎branches/try2/src/test/run-pass/mod_dir_path2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
// xfail-pretty
1212
// xfail-fast
1313

14-
#[path2 = "mod_dir_simple"]
14+
#[path = "mod_dir_simple"]
1515
mod pancakes {
16-
#[path2 = "test.rs"]
16+
#[path = "test.rs"]
1717
pub mod syrup;
1818
}
1919

‎branches/try2/src/test/run-pass/mod_dir_path3.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// xfail-pretty
1212
// xfail-fast
1313

14-
#[path2 = "mod_dir_simple"]
14+
#[path = "mod_dir_simple"]
1515
mod pancakes {
1616
pub mod test;
1717
}

‎branches/try2/src/test/run-pass/mod_dir_path_multi.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
// xfail-pretty
1212
// xfail-fast
1313

14-
#[path2 = "mod_dir_simple"]
14+
#[path = "mod_dir_simple"]
1515
mod biscuits {
1616
pub mod test;
1717
}
1818

19-
#[path2 = "mod_dir_simple"]
19+
#[path = "mod_dir_simple"]
2020
mod gravy {
2121
pub mod test;
2222
}

0 commit comments

Comments
 (0)