Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit db020ab

Browse files
committedJul 17, 2012
rustc: Implement and enforce instance coherence
1 parent b5729bd commit db020ab

File tree

111 files changed

+1740
-520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1740
-520
lines changed
 

‎src/cargo/cargo.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import result::{ok, err};
1111
import io::writer_util;
1212
import std::{map, json, tempfile, term, sort, getopts};
1313
import map::hashmap;
14-
import json::to_str;
14+
import to_str::to_str;
1515
import getopts::{optflag, optopt, opt_present};
1616

1717
type package = {
@@ -535,7 +535,7 @@ fn load_one_source_package(src: source, p: map::hashmap<~str, json::json>) {
535535
versions: ~[]
536536
};
537537

538-
alt src.packages.position(|pkg| pkg.uuid == uuid ) {
538+
alt vec::position(src.packages, |pkg| pkg.uuid == uuid) {
539539
some(idx) {
540540
src.packages[idx] = newpkg;
541541
log(debug, ~" updated package: " + src.name + ~"/" + name);

‎src/libcore/core.rs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55
import option::{some, none};
66
import option = option::option;
77
import path = path::path;
8-
import str::extensions;
98
import tuple::extensions;
9+
import str::{extensions, str_slice, unique_str};
1010
import vec::extensions;
11+
import vec::{const_vector, copyable_vector, immutable_vector};
12+
import vec::{immutable_copyable_vector, iter_trait_extensions, vec_concat};
13+
import iter::{base_iter, extended_iter, copyable_iter, times};
1114
import option::extensions;
1215
import option_iter::extensions;
13-
import ptr::extensions;
16+
import ptr::{extensions, ptr};
1417
import rand::extensions;
1518
import result::extensions;
1619
import int::{num, times};
@@ -26,11 +29,18 @@ import u64::{num, times};
2629
import float::num;
2730
import f32::num;
2831
import f64::num;
32+
import num::num;
2933

3034
export path, option, some, none, unreachable;
3135
export extensions;
3236
// The following exports are the extension impls for numeric types
3337
export num, times;
38+
// The following exports are the common traits
39+
export str_slice, unique_str;
40+
export const_vector, copyable_vector, immutable_vector;
41+
export immutable_copyable_vector, iter_trait_extensions, vec_concat;
42+
export base_iter, copyable_iter, extended_iter;
43+
export ptr;
3444

3545
// Export the log levels as global constants. Higher levels mean
3646
// more-verbosity. Error is the bottom level, default logging level is

0 commit comments

Comments
 (0)
Please sign in to comment.