Skip to content

Commit be4ffb2

Browse files
borsbors
committed
---
yaml --- r: 96943 b: refs/heads/dist-snap c: 9477c49 h: refs/heads/master i: 96941: a45338e 96939: 4af9714 96935: 5447ae7 96927: 324d241 v: v3
1 parent c9110a5 commit be4ffb2

File tree

23 files changed

+230
-409
lines changed

23 files changed

+230
-409
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 6cad8f4f14da1dd529100779db74b03d6db20faf
9+
refs/heads/dist-snap: 9477c49a7b4eec2c2a3e0d9a28c4129e3d1fa6ec
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/mk/tests.mk

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -760,21 +760,27 @@ CRATE_DOC_LIB-extra = $(EXTRALIB_CRATE)
760760

761761
define DEF_CRATE_DOC_TEST
762762

763-
check-stage$(1)-T-$(2)-H-$(2)-doc-$(3)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(2),doc-$(3))
763+
check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4))
764764

765-
$$(call TEST_OK_FILE,$(1),$(2),$(2),doc-$(3)): \
766-
$$(TEST_SREQ$(1)_T_$(2)_H_$(2)) \
767-
$$(HBIN$(1)_H_$(2))/rustdoc$$(X_$(2))
768-
@$$(call E, run doc-$(3) [$(2)])
769-
$$(Q)$$(HBIN$(1)_H_$(2))/rustdoc$$(X_$(2)) --test \
770-
$$(CRATE_DOC_LIB-$(3)) && touch $$@
765+
ifeq ($(2),$$(CFG_BUILD))
766+
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): \
767+
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
768+
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3))
769+
@$$(call E, run doc-$(4) [$(2)])
770+
$$(Q)$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) --test \
771+
$$(CRATE_DOC_LIB-$(4)) && touch $$@
772+
else
773+
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)):
774+
touch $$@
775+
endif
771776

772777
endef
773778

774779
$(foreach host,$(CFG_HOST), \
775-
$(foreach stage,$(STAGES), \
776-
$(foreach crate,$(TEST_DOC_CRATES), \
777-
$(eval $(call DEF_CRATE_DOC_TEST,$(stage),$(host),$(crate))))))
780+
$(foreach target,$(CFG_TARGET), \
781+
$(foreach stage,$(STAGES), \
782+
$(foreach crate,$(TEST_DOC_CRATES), \
783+
$(eval $(call DEF_CRATE_DOC_TEST,$(stage),$(target),$(host),$(crate)))))))
778784

779785
######################################################################
780786
# Extracting tests for docs

‎branches/dist-snap/src/librustc/back/link.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ fn link_rlib(sess: Session,
848848
out_filename: &Path) -> Archive {
849849
let mut a = Archive::create(sess, out_filename, obj_filename);
850850

851-
for &(ref l, kind) in cstore::get_used_libraries(sess.cstore).iter() {
851+
for &(ref l, kind) in sess.cstore.get_used_libraries().iter() {
852852
match kind {
853853
cstore::NativeStatic => {
854854
a.add_native_library(l.as_slice());
@@ -922,9 +922,9 @@ fn link_staticlib(sess: Session, obj_filename: &Path, out_filename: &Path) {
922922
let mut a = link_rlib(sess, None, obj_filename, out_filename);
923923
a.add_native_library("morestack");
924924

925-
let crates = cstore::get_used_crates(sess.cstore, cstore::RequireStatic);
925+
let crates = sess.cstore.get_used_crates(cstore::RequireStatic);
926926
for &(cnum, ref path) in crates.iter() {
927-
let name = cstore::get_crate_data(sess.cstore, cnum).name;
927+
let name = sess.cstore.get_crate_data(cnum).name;
928928
let p = match *path {
929929
Some(ref p) => p.clone(), None => {
930930
sess.err(format!("could not find rlib for: `{}`", name));
@@ -1082,7 +1082,7 @@ fn link_args(sess: Session,
10821082
// Finally add all the linker arguments provided on the command line along
10831083
// with any #[link_args] attributes found inside the crate
10841084
args.push_all(sess.opts.linker_args);
1085-
for arg in cstore::get_used_link_args(sess.cstore).iter() {
1085+
for arg in sess.cstore.get_used_link_args().iter() {
10861086
args.push(arg.clone());
10871087
}
10881088
return args;
@@ -1111,7 +1111,7 @@ fn add_local_native_libraries(args: &mut ~[~str], sess: Session) {
11111111
args.push("-L" + path.as_str().unwrap().to_owned());
11121112
}
11131113

1114-
for &(ref l, kind) in cstore::get_used_libraries(sess.cstore).iter() {
1114+
for &(ref l, kind) in sess.cstore.get_used_libraries().iter() {
11151115
match kind {
11161116
cstore::NativeUnknown | cstore::NativeStatic => {
11171117
args.push("-l" + *l);
@@ -1153,7 +1153,7 @@ fn add_upstream_rust_crates(args: &mut ~[~str], sess: Session,
11531153
// all dynamic libaries require dynamic dependencies (see above), so
11541154
// it's satisfactory to include either all static libraries or all
11551155
// dynamic libraries.
1156-
let crates = cstore::get_used_crates(cstore, cstore::RequireStatic);
1156+
let crates = cstore.get_used_crates(cstore::RequireStatic);
11571157
if crates.iter().all(|&(_, ref p)| p.is_some()) {
11581158
for (cnum, path) in crates.move_iter() {
11591159
let cratepath = path.unwrap();
@@ -1173,7 +1173,7 @@ fn add_upstream_rust_crates(args: &mut ~[~str], sess: Session,
11731173
// If we're not doing LTO, then our job is simply to just link
11741174
// against the archive.
11751175
if sess.lto() {
1176-
let name = cstore::get_crate_data(sess.cstore, cnum).name;
1176+
let name = sess.cstore.get_crate_data(cnum).name;
11771177
time(sess.time_passes(), format!("altering {}.rlib", name),
11781178
(), |()| {
11791179
let dst = tmpdir.join(cratepath.filename().unwrap());
@@ -1206,13 +1206,13 @@ fn add_upstream_rust_crates(args: &mut ~[~str], sess: Session,
12061206
// this case is the fallback
12071207
// * If an executable is being created, and one of the inputs is missing as
12081208
// a static library, then this is the fallback case.
1209-
let crates = cstore::get_used_crates(cstore, cstore::RequireDynamic);
1209+
let crates = cstore.get_used_crates(cstore::RequireDynamic);
12101210
for &(cnum, ref path) in crates.iter() {
12111211
let cratepath = match *path {
12121212
Some(ref p) => p.clone(),
12131213
None => {
12141214
sess.err(format!("could not find dynamic library for: `{}`",
1215-
cstore::get_crate_data(sess.cstore, cnum).name));
1215+
sess.cstore.get_crate_data(cnum).name));
12161216
return
12171217
}
12181218
};
@@ -1245,7 +1245,7 @@ fn add_upstream_rust_crates(args: &mut ~[~str], sess: Session,
12451245
// also be resolved in the target crate.
12461246
fn add_upstream_native_libraries(args: &mut ~[~str], sess: Session) {
12471247
let cstore = sess.cstore;
1248-
cstore::iter_crate_data(cstore, |cnum, _| {
1248+
cstore.iter_crate_data(|cnum, _| {
12491249
let libs = csearch::get_native_libraries(cstore, cnum);
12501250
for &(kind, ref lib) in libs.iter() {
12511251
match kind {

‎branches/dist-snap/src/librustc/back/lto.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ pub fn run(sess: session::Session, llmod: ModuleRef,
3333
// For each of our upstream dependencies, find the corresponding rlib and
3434
// load the bitcode from the archive. Then merge it into the current LLVM
3535
// module that we've got.
36-
let crates = cstore::get_used_crates(sess.cstore, cstore::RequireStatic);
36+
let crates = sess.cstore.get_used_crates(cstore::RequireStatic);
3737
for (cnum, path) in crates.move_iter() {
38-
let name = cstore::get_crate_data(sess.cstore, cnum).name;
38+
let name = sess.cstore.get_crate_data(cnum).name;
3939
let path = match path {
4040
Some(p) => p,
4141
None => {

‎branches/dist-snap/src/librustc/back/rpath.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub fn get_rpath_flags(sess: session::Session, out_filename: &Path) -> ~[~str] {
4141

4242
let sysroot = sess.filesearch.sysroot();
4343
let output = out_filename;
44-
let libs = cstore::get_used_crates(sess.cstore, cstore::RequireDynamic);
44+
let libs = sess.cstore.get_used_crates(cstore::RequireDynamic);
4545
let libs = libs.move_iter().filter_map(|(_, l)| l.map(|p| p.clone())).collect();
4646
// We don't currently rpath extern libraries, but we know
4747
// where rustrt is and we know every rust program needs it

‎branches/dist-snap/src/librustc/driver/driver.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ use front;
1818
use lib::llvm::llvm;
1919
use lib::llvm::{ContextRef, ModuleRef};
2020
use metadata::common::LinkMeta;
21-
use metadata::{creader, cstore, filesearch};
21+
use metadata::{creader, filesearch};
22+
use metadata::cstore::CStore;
2223
use metadata;
2324
use middle::{trans, freevars, kind, ty, typeck, lint, astencode, reachable};
2425
use middle;
@@ -853,7 +854,7 @@ pub fn build_session_(sopts: @session::options,
853854
let target_cfg = build_target_config(sopts, demitter);
854855
let p_s = parse::new_parse_sess_special_handler(span_diagnostic_handler,
855856
cm);
856-
let cstore = @mut cstore::mk_cstore(token::get_ident_interner());
857+
let cstore = @mut CStore::new(token::get_ident_interner());
857858
let filesearch = filesearch::mk_filesearch(
858859
&sopts.maybe_sysroot,
859860
sopts.target_triple,

‎branches/dist-snap/src/librustc/metadata/creader.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ fn visit_crate(e: &Env, c: &ast::Crate) {
114114
for a in c.attrs.iter().filter(|m| "link_args" == m.name()) {
115115
match a.value_str() {
116116
Some(ref linkarg) => {
117-
cstore::add_used_link_args(cstore, *linkarg);
117+
cstore.add_used_link_args(*linkarg);
118118
}
119119
None => {/* fallthrough */ }
120120
}
@@ -149,7 +149,7 @@ fn visit_view_item(e: @mut Env, i: &ast::view_item) {
149149
version,
150150
@"",
151151
i.span);
152-
cstore::add_extern_mod_stmt_cnum(e.sess.cstore, id, cnum);
152+
e.sess.cstore.add_extern_mod_stmt_cnum(id, cnum);
153153
}
154154
_ => ()
155155
}
@@ -170,7 +170,7 @@ fn visit_item(e: &Env, i: @ast::item) {
170170
for m in link_args.iter() {
171171
match m.value_str() {
172172
Some(linkarg) => {
173-
cstore::add_used_link_args(cstore, linkarg);
173+
cstore.add_used_link_args(linkarg);
174174
}
175175
None => { /* fallthrough */ }
176176
}
@@ -222,7 +222,7 @@ fn visit_item(e: &Env, i: @ast::item) {
222222
if n.is_empty() {
223223
e.sess.span_err(m.span, "#[link(name = \"\")] given with empty name");
224224
} else {
225-
cstore::add_used_library(cstore, n.to_owned(), kind);
225+
cstore.add_used_library(n.to_owned(), kind);
226226
}
227227
}
228228
None => {}
@@ -296,8 +296,8 @@ fn resolve_crate(e: @mut Env,
296296
};
297297

298298
let cstore = e.sess.cstore;
299-
cstore::set_crate_data(cstore, cnum, cmeta);
300-
cstore::add_used_crate_source(cstore, cstore::CrateSource {
299+
cstore.set_crate_data(cnum, cmeta);
300+
cstore.add_used_crate_source(cstore::CrateSource {
301301
dylib: dylib,
302302
rlib: rlib,
303303
cnum: cnum,

0 commit comments

Comments
 (0)