Skip to content

Commit 081c75f

Browse files
huonwhuonw
committed
---
yaml --- r: 59045 b: refs/heads/incoming c: 81e06a5 h: refs/heads/master i: 59043: 57d39a2 v: v3
1 parent 01b80c3 commit 081c75f

Some content is hidden

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

58 files changed

+549
-563
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: e9d0018abf8dd0c692db4cfe8f5d1bd1c150d643
9+
refs/heads/incoming: 81e06a5259f5e477f552a35ac58c4b69f58b1451
1010
refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/incoming/src/librustc/back/link.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -698,8 +698,8 @@ pub fn exported_name(sess: Session,
698698
vers: &str) -> ~str {
699699
return mangle(sess,
700700
vec::append_one(
701-
vec::append_one(path, path_name(sess.ident_of(hash))),
702-
path_name(sess.ident_of(vers))));
701+
vec::append_one(path, path_name(sess.ident_of(hash.to_owned()))),
702+
path_name(sess.ident_of(vers.to_owned()))));
703703
}
704704
705705
pub fn mangle_exported_name(ccx: @CrateContext,
@@ -717,14 +717,14 @@ pub fn mangle_internal_name_by_type_only(ccx: @CrateContext,
717717
let s = ppaux::ty_to_short_str(ccx.tcx, t);
718718
let hash = get_symbol_hash(ccx, t);
719719
return mangle(ccx.sess,
720-
~[path_name(ccx.sess.ident_of(name)),
720+
~[path_name(ccx.sess.ident_of(name.to_owned())),
721721
path_name(ccx.sess.ident_of(s)),
722-
path_name(ccx.sess.ident_of(hash))]);
722+
path_name(ccx.sess.ident_of(hash.to_owned()))]);
723723
}
724724
725725
pub fn mangle_internal_name_by_path_and_seq(ccx: @CrateContext,
726726
path: path,
727-
flav: &str) -> ~str {
727+
flav: ~str) -> ~str {
728728
return mangle(ccx.sess,
729729
vec::append_one(path, path_name((ccx.names)(flav))));
730730
}
@@ -733,7 +733,7 @@ pub fn mangle_internal_name_by_path(ccx: @CrateContext, path: path) -> ~str {
733733
return mangle(ccx.sess, path);
734734
}
735735
736-
pub fn mangle_internal_name_by_seq(ccx: @CrateContext, flav: &str) -> ~str {
736+
pub fn mangle_internal_name_by_seq(ccx: @CrateContext, flav: ~str) -> ~str {
737737
return fmt!("%s_%u", flav, (ccx.names)(flav).repr);
738738
}
739739

‎branches/incoming/src/librustc/driver/session.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ pub impl Session_ {
285285
fn str_of(@self, id: ast::ident) -> @~str {
286286
self.parse_sess.interner.get(id)
287287
}
288-
fn ident_of(@self, st: &str) -> ast::ident {
289-
self.parse_sess.interner.intern(st)
288+
fn ident_of(@self, st: ~str) -> ast::ident {
289+
self.parse_sess.interner.intern(@st)
290290
}
291291
fn intr(@self) -> @syntax::parse::token::ident_interner {
292292
self.parse_sess.interner

‎branches/incoming/src/librustc/front/core_inject.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn inject_libcore_ref(sess: Session,
4242
let n1 = sess.next_node_id();
4343
let vi1 = @ast::view_item {
4444
node: ast::view_item_extern_mod(
45-
sess.ident_of("core"), ~[], n1),
45+
sess.ident_of(~"core"), ~[], n1),
4646
attrs: ~[
4747
spanned(ast::attribute_ {
4848
style: ast::attr_inner,
@@ -78,8 +78,8 @@ fn inject_libcore_ref(sess: Session,
7878
span: dummy_sp(),
7979
global: false,
8080
idents: ~[
81-
sess.ident_of("core"),
82-
sess.ident_of("prelude")
81+
sess.ident_of(~"core"),
82+
sess.ident_of(~"prelude")
8383
],
8484
rp: None,
8585
types: ~[]

‎branches/incoming/src/librustc/front/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ fn mk_std(cx: &TestCtxt) -> @ast::view_item {
274274
let vers = nospan(vers);
275275
let mi = ast::meta_name_value(@~"vers", vers);
276276
let mi = nospan(mi);
277-
let id_std = cx.sess.ident_of("std");
277+
let id_std = cx.sess.ident_of(~"std");
278278
let vi = if is_std(cx) {
279279
ast::view_item_use(
280280
~[@nospan(ast::view_path_simple(id_std,
@@ -322,7 +322,7 @@ fn mk_test_module(cx: &TestCtxt) -> @ast::item {
322322
attr::mk_attr(attr::mk_word_item(@~"!resolve_unexported"));
323323

324324
let item = ast::item {
325-
ident: cx.sess.ident_of("__test"),
325+
ident: cx.sess.ident_of(~"__test"),
326326
attrs: ~[resolve_unexported_attr],
327327
id: cx.sess.next_node_id(),
328328
node: item_,

‎branches/incoming/src/librustc/metadata/csearch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub fn get_item_path(tcx: ty::ctxt, def: ast::def_id) -> ast_map::path {
7070
// FIXME #1920: This path is not always correct if the crate is not linked
7171
// into the root namespace.
7272
vec::append(~[ast_map::path_mod(tcx.sess.ident_of(
73-
*cdata.name))], path)
73+
/*bad*/copy *cdata.name))], path)
7474
}
7575

7676
pub enum found_ast {

‎branches/incoming/src/librustc/metadata/decoder.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ fn item_path(intr: @ident_interner, item_doc: ebml::Doc) -> ast_map::path {
294294
for reader::docs(path_doc) |tag, elt_doc| {
295295
if tag == tag_path_elt_mod {
296296
let str = reader::doc_as_str(elt_doc);
297-
result.push(ast_map::path_mod(intr.intern(str)));
297+
result.push(ast_map::path_mod(intr.intern(@str)));
298298
} else if tag == tag_path_elt_name {
299299
let str = reader::doc_as_str(elt_doc);
300-
result.push(ast_map::path_name(intr.intern(str)));
300+
result.push(ast_map::path_name(intr.intern(@str)));
301301
} else {
302302
// ignore tag_path_len element
303303
}
@@ -311,7 +311,7 @@ fn item_name(intr: @ident_interner, item: ebml::Doc) -> ast::ident {
311311
do reader::with_doc_data(name) |data| {
312312
let string = str::from_bytes_slice(data);
313313
match intr.find_equiv(&StringRef(string)) {
314-
None => intr.intern(string),
314+
None => intr.intern(@(string.to_owned())),
315315
Some(val) => val,
316316
}
317317
}
@@ -828,7 +828,7 @@ pub fn get_type_name_if_impl(intr: @ident_interner,
828828
}
829829

830830
for reader::tagged_docs(item, tag_item_impl_type_basename) |doc| {
831-
return Some(intr.intern(str::from_bytes(reader::doc_data(doc))));
831+
return Some(intr.intern(@str::from_bytes(reader::doc_data(doc))));
832832
}
833833

834834
return None;
@@ -1080,7 +1080,7 @@ pub fn get_crate_deps(intr: @ident_interner, data: @~[u8]) -> ~[crate_dep] {
10801080
}
10811081
for reader::tagged_docs(depsdoc, tag_crate_dep) |depdoc| {
10821082
deps.push(crate_dep {cnum: crate_num,
1083-
name: intr.intern(docstr(depdoc, tag_crate_dep_name)),
1083+
name: intr.intern(@docstr(depdoc, tag_crate_dep_name)),
10841084
vers: @docstr(depdoc, tag_crate_dep_vers),
10851085
hash: @docstr(depdoc, tag_crate_dep_hash)});
10861086
crate_num += 1;

‎branches/incoming/src/librustc/middle/astencode.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,7 @@ trait fake_ext_ctxt {
11631163
fn cfg(&self) -> ast::crate_cfg;
11641164
fn parse_sess(&self) -> @mut parse::ParseSess;
11651165
fn call_site(&self) -> span;
1166-
fn ident_of(&self, st: &str) -> ast::ident;
1166+
fn ident_of(&self, st: ~str) -> ast::ident;
11671167
}
11681168

11691169
#[cfg(test)]
@@ -1180,8 +1180,8 @@ impl fake_ext_ctxt for fake_session {
11801180
expn_info: None
11811181
}
11821182
}
1183-
fn ident_of(&self, st: &str) -> ast::ident {
1184-
self.interner.intern(st)
1183+
fn ident_of(&self, st: ~str) -> ast::ident {
1184+
self.interner.intern(@st)
11851185
}
11861186
}
11871187

‎branches/incoming/src/librustc/middle/check_match.rs

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -822,43 +822,65 @@ pub fn check_legality_of_move_bindings(cx: @MatchCheckCtxt,
822822
}
823823
}
824824
825-
// Now check to ensure that any move binding is not behind an @ or &.
826-
// This is always illegal.
825+
// Now check to ensure that any move binding is not behind an
826+
// @ or &, or within a struct with a destructor. This is
827+
// always illegal.
827828
let vt = visit::mk_vt(@visit::Visitor {
828-
visit_pat: |pat, behind_bad_pointer: bool, v| {
829+
visit_pat: |pat, (behind_bad_pointer, behind_dtor_struct): (bool, bool), v| {
829830
match pat.node {
830831
pat_ident(_, _, sub) => {
831832
debug!("(check legality of move) checking pat \
832-
ident with behind_bad_pointer %?",
833-
behind_bad_pointer);
833+
ident with behind_bad_pointer %? and behind_dtor_struct %?",
834+
behind_bad_pointer, behind_dtor_struct);
834835
835-
if behind_bad_pointer &&
836+
if behind_bad_pointer || behind_dtor_struct &&
836837
cx.moves_map.contains(&pat.id)
837838
{
838-
cx.tcx.sess.span_err(
839-
pat.span,
840-
"by-move pattern \
841-
bindings may not occur \
842-
behind @ or & bindings");
839+
let msg = if behind_bad_pointer {
840+
"by-move pattern bindings may not occur behind @ or & bindings"
841+
} else {
842+
"cannot bind by-move within struct (it has a destructor)"
843+
};
844+
cx.tcx.sess.span_err(pat.span, msg);
843845
}
844846
845847
match sub {
846848
None => {}
847849
Some(subpat) => {
848-
(v.visit_pat)(subpat, behind_bad_pointer, v);
850+
(v.visit_pat)(subpat,
851+
(behind_bad_pointer, behind_dtor_struct),
852+
v);
849853
}
850854
}
851855
}
852856
853857
pat_box(subpat) | pat_region(subpat) => {
854-
(v.visit_pat)(subpat, true, v);
858+
(v.visit_pat)(subpat, (true, behind_dtor_struct), v);
855859
}
856860
857-
_ => visit::visit_pat(pat, behind_bad_pointer, v)
861+
pat_struct(_, ref fields, _) => {
862+
let behind_dtor_struct = behind_dtor_struct ||
863+
(match cx.tcx.def_map.find(&pat.id) {
864+
Some(&def_struct(id)) => {
865+
ty::has_dtor(cx.tcx, id)
866+
}
867+
_ => false
868+
});
869+
debug!("(check legality of move) checking pat \
870+
struct with behind_bad_pointer %? and behind_dtor_struct %?",
871+
behind_bad_pointer, behind_dtor_struct);
872+
873+
for fields.each |fld| {
874+
(v.visit_pat)(fld.pat, (behind_bad_pointer,
875+
behind_dtor_struct), v)
876+
}
877+
}
878+
879+
_ => visit::visit_pat(pat, (behind_bad_pointer, behind_dtor_struct), v)
858880
}
859881
},
860-
.. *visit::default_visitor::<bool>()
882+
.. *visit::default_visitor::<(bool, bool)>()
861883
});
862-
(vt.visit_pat)(*pat, false, vt);
884+
(vt.visit_pat)(*pat, (false, false), vt);
863885
}
864886
}

‎branches/incoming/src/librustc/middle/resolve.rs

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ use syntax::attr::{attr_metas, contains_name, attrs_contains_name};
6464
use syntax::parse::token::ident_interner;
6565
use syntax::parse::token::special_idents;
6666
use syntax::print::pprust::path_to_str;
67-
use syntax::codemap::{span, dummy_sp, BytePos};
67+
use syntax::codemap::{span, dummy_sp};
6868
use syntax::visit::{default_visitor, mk_vt, Visitor, visit_block};
6969
use syntax::visit::{visit_crate, visit_expr, visit_expr_opt};
7070
use syntax::visit::{visit_foreign_item, visit_item};
@@ -708,7 +708,7 @@ pub struct PrimitiveTypeTable {
708708
}
709709
710710
pub impl PrimitiveTypeTable {
711-
fn intern(&mut self, intr: @ident_interner, string: &str,
711+
fn intern(&mut self, intr: @ident_interner, string: @~str,
712712
primitive_type: prim_ty) {
713713
let ident = intr.intern(string);
714714
self.primitive_types.insert(ident, primitive_type);
@@ -720,22 +720,22 @@ pub fn PrimitiveTypeTable(intr: @ident_interner) -> PrimitiveTypeTable {
720720
primitive_types: HashMap::new()
721721
};
722722
723-
table.intern(intr, "bool", ty_bool);
724-
table.intern(intr, "char", ty_int(ty_char));
725-
table.intern(intr, "float", ty_float(ty_f));
726-
table.intern(intr, "f32", ty_float(ty_f32));
727-
table.intern(intr, "f64", ty_float(ty_f64));
728-
table.intern(intr, "int", ty_int(ty_i));
729-
table.intern(intr, "i8", ty_int(ty_i8));
730-
table.intern(intr, "i16", ty_int(ty_i16));
731-
table.intern(intr, "i32", ty_int(ty_i32));
732-
table.intern(intr, "i64", ty_int(ty_i64));
733-
table.intern(intr, "str", ty_str);
734-
table.intern(intr, "uint", ty_uint(ty_u));
735-
table.intern(intr, "u8", ty_uint(ty_u8));
736-
table.intern(intr, "u16", ty_uint(ty_u16));
737-
table.intern(intr, "u32", ty_uint(ty_u32));
738-
table.intern(intr, "u64", ty_uint(ty_u64));
723+
table.intern(intr, @~"bool", ty_bool);
724+
table.intern(intr, @~"char", ty_int(ty_char));
725+
table.intern(intr, @~"float", ty_float(ty_f));
726+
table.intern(intr, @~"f32", ty_float(ty_f32));
727+
table.intern(intr, @~"f64", ty_float(ty_f64));
728+
table.intern(intr, @~"int", ty_int(ty_i));
729+
table.intern(intr, @~"i8", ty_int(ty_i8));
730+
table.intern(intr, @~"i16", ty_int(ty_i16));
731+
table.intern(intr, @~"i32", ty_int(ty_i32));
732+
table.intern(intr, @~"i64", ty_int(ty_i64));
733+
table.intern(intr, @~"str", ty_str);
734+
table.intern(intr, @~"uint", ty_uint(ty_u));
735+
table.intern(intr, @~"u8", ty_uint(ty_u8));
736+
table.intern(intr, @~"u16", ty_uint(ty_u16));
737+
table.intern(intr, @~"u32", ty_uint(ty_u32));
738+
table.intern(intr, @~"u64", ty_uint(ty_u64));
739739
740740
return table;
741741
}
@@ -1675,7 +1675,7 @@ pub impl Resolver {
16751675

16761676
let mut current_module = root;
16771677
for pieces.each |ident_str| {
1678-
let ident = self.session.ident_of(*ident_str);
1678+
let ident = self.session.ident_of(/*bad*/copy *ident_str);
16791679
// Create or reuse a graph node for the child.
16801680
let (child_name_bindings, new_parent) =
16811681
self.add_child(ident,
@@ -2482,16 +2482,6 @@ pub impl Resolver {
24822482
TypeNS,
24832483
name_search_type) {
24842484
Failed => {
2485-
let segment_name = self.session.str_of(name);
2486-
let module_name = self.module_to_str(search_module);
2487-
if module_name == ~"???" {
2488-
self.session.span_err(span {lo: span.lo, hi: span.lo +
2489-
BytePos(str::len(*segment_name)), expn_info:
2490-
span.expn_info}, fmt!("unresolved import. maybe \
2491-
a missing 'extern mod %s'?",
2492-
*segment_name));
2493-
return Failed;
2494-
}
24952485
self.session.span_err(span, ~"unresolved name");
24962486
return Failed;
24972487
}

‎branches/incoming/src/librustc/middle/resolve_stage0.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ pub struct PrimitiveTypeTable {
709709
}
710710
711711
pub impl PrimitiveTypeTable {
712-
fn intern(&mut self, intr: @ident_interner, string: &str,
712+
fn intern(&mut self, intr: @ident_interner, string: @~str,
713713
primitive_type: prim_ty) {
714714
let ident = intr.intern(string);
715715
self.primitive_types.insert(ident, primitive_type);
@@ -721,22 +721,22 @@ pub fn PrimitiveTypeTable(intr: @ident_interner) -> PrimitiveTypeTable {
721721
primitive_types: HashMap::new()
722722
};
723723
724-
table.intern(intr, "bool", ty_bool);
725-
table.intern(intr, "char", ty_int(ty_char));
726-
table.intern(intr, "float", ty_float(ty_f));
727-
table.intern(intr, "f32", ty_float(ty_f32));
728-
table.intern(intr, "f64", ty_float(ty_f64));
729-
table.intern(intr, "int", ty_int(ty_i));
730-
table.intern(intr, "i8", ty_int(ty_i8));
731-
table.intern(intr, "i16", ty_int(ty_i16));
732-
table.intern(intr, "i32", ty_int(ty_i32));
733-
table.intern(intr, "i64", ty_int(ty_i64));
734-
table.intern(intr, "str", ty_str);
735-
table.intern(intr, "uint", ty_uint(ty_u));
736-
table.intern(intr, "u8", ty_uint(ty_u8));
737-
table.intern(intr, "u16", ty_uint(ty_u16));
738-
table.intern(intr, "u32", ty_uint(ty_u32));
739-
table.intern(intr, "u64", ty_uint(ty_u64));
724+
table.intern(intr, @~"bool", ty_bool);
725+
table.intern(intr, @~"char", ty_int(ty_char));
726+
table.intern(intr, @~"float", ty_float(ty_f));
727+
table.intern(intr, @~"f32", ty_float(ty_f32));
728+
table.intern(intr, @~"f64", ty_float(ty_f64));
729+
table.intern(intr, @~"int", ty_int(ty_i));
730+
table.intern(intr, @~"i8", ty_int(ty_i8));
731+
table.intern(intr, @~"i16", ty_int(ty_i16));
732+
table.intern(intr, @~"i32", ty_int(ty_i32));
733+
table.intern(intr, @~"i64", ty_int(ty_i64));
734+
table.intern(intr, @~"str", ty_str);
735+
table.intern(intr, @~"uint", ty_uint(ty_u));
736+
table.intern(intr, @~"u8", ty_uint(ty_u8));
737+
table.intern(intr, @~"u16", ty_uint(ty_u16));
738+
table.intern(intr, @~"u32", ty_uint(ty_u32));
739+
table.intern(intr, @~"u64", ty_uint(ty_u64));
740740
741741
return table;
742742
}

0 commit comments

Comments
 (0)