---

yaml
---
r: 81830
b: refs/heads/master
c: 5867bbd
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a7d68adbdd75300a4a10b2dcc59e1048f613db48
+refs/heads/master: 5867bbd794785c4ea51becbc5d008549b03dcf16
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/src/librustc/middle/trans/base.rs

@@ -2321,6 +2321,23 @@ pub fn trans_mod(ccx: @mut CrateContext, m: &ast::_mod) {
     }
 }
 
+fn finish_register_fn(ccx: @mut CrateContext, sp: Span, sym: ~str, node_id: ast::NodeId,
+                      llfn: ValueRef) {
+    ccx.item_symbols.insert(node_id, sym);
+
+    if !*ccx.sess.building_library {
+        lib::llvm::SetLinkage(llfn, lib::llvm::InternalLinkage);
+    }
+
+    // FIXME #4404 android JNI hacks
+    let is_entry = is_entry_fn(&ccx.sess, node_id) && (!*ccx.sess.building_library ||
+                      (*ccx.sess.building_library &&
+                       ccx.sess.targ_cfg.os == session::OsAndroid));
+    if is_entry {
+        create_entry_wrapper(ccx, sp, llfn);
+    }
+}
+
 pub fn register_fn(ccx: @mut CrateContext,
                    sp: Span,
                    sym: ~str,
@@ -2336,15 +2353,7 @@ pub fn register_fn(ccx: @mut CrateContext,
     };
 
     let llfn = decl_rust_fn(ccx, f.sig.inputs, f.sig.output, sym);
-    ccx.item_symbols.insert(node_id, sym);
-
-    // FIXME #4404 android JNI hacks
-    let is_entry = is_entry_fn(&ccx.sess, node_id) && (!*ccx.sess.building_library ||
-                      (*ccx.sess.building_library &&
-                       ccx.sess.targ_cfg.os == session::OsAndroid));
-    if is_entry {
-        create_entry_wrapper(ccx, sp, llfn);
-    }
+    finish_register_fn(ccx, sp, sym, node_id, llfn);
     llfn
 }
 
@@ -2361,15 +2370,7 @@ pub fn register_fn_llvmty(ccx: @mut CrateContext,
            ast_map::path_to_str(item_path(ccx, &node_id), token::get_ident_interner()));
 
     let llfn = decl_fn(ccx.llmod, sym, cc, fn_ty);
-    ccx.item_symbols.insert(node_id, sym);
-
-    // FIXME #4404 android JNI hacks
-    let is_entry = is_entry_fn(&ccx.sess, node_id) && (!*ccx.sess.building_library ||
-                      (*ccx.sess.building_library &&
-                       ccx.sess.targ_cfg.os == session::OsAndroid));
-    if is_entry {
-        create_entry_wrapper(ccx, sp, llfn);
-    }
+    finish_register_fn(ccx, sp, sym, node_id, llfn);
     llfn
 }
 

trunk/src/libstd/rt/io/mod.rs

@@ -472,7 +472,7 @@ pub trait Writer {
 
 pub trait Stream: Reader + Writer { }
 
-impl<T: Reader + Writer> Stream for T {}
+impl<T: Reader + Writer> Stream for T;
 
 pub enum SeekStyle {
     /// Seek from the beginning of the stream

trunk/src/libstd/rt/uv/file.rs

@@ -22,7 +22,7 @@ use libc::{c_int};
 use option::{None, Some, Option};
 
 pub struct FsRequest(*uvll::uv_fs_t);
-impl Request for FsRequest {}
+impl Request for FsRequest;
 
 pub struct RequestData {
     complete_cb: Option<FsCallback>

trunk/src/libsyntax/parse/obsolete.rs

@@ -65,7 +65,6 @@ pub enum ObsoleteSyntax {
     ObsoletePrivVisibility,
     ObsoleteTraitFuncVisibility,
     ObsoleteConstPointer,
-    ObsoleteEmptyImpl,
 }
 
 impl to_bytes::IterBytes for ObsoleteSyntax {
@@ -257,10 +256,6 @@ impl ParserObsoleteMethods for Parser {
                 "instead of `&const Foo` or `@const Foo`, write `&Foo` or \
                  `@Foo`"
             ),
-            ObsoleteEmptyImpl => (
-                "empty implementation",
-                "instead of `impl A;`, write `impl A {}`"
-            ),
         };
 
         self.report(sp, kind, kind_str, desc);

trunk/src/libsyntax/parse/parser.rs

@@ -3852,9 +3852,7 @@ impl Parser {
         }
 
         let mut meths = ~[];
-        if self.eat(&token::SEMI) {
-            self.obsolete(*self.span, ObsoleteEmptyImpl);
-        } else {
+        if !self.eat(&token::SEMI) {
             self.expect(&token::LBRACE);
             while !self.eat(&token::RBRACE) {
                 meths.push(self.parse_method());

trunk/src/libsyntax/print/pprust.rs

@@ -598,12 +598,18 @@ pub fn print_item(s: @ps, item: &ast::item) {
 
         print_type(s, ty);
 
-        space(s.s);
-        bopen(s);
-        for meth in methods.iter() {
-           print_method(s, *meth);
+        if methods.len() == 0 {
+            word(s.s, ";");
+            end(s); // end the head-ibox
+            end(s); // end the outer cbox
+        } else {
+            space(s.s);
+            bopen(s);
+            for meth in methods.iter() {
+               print_method(s, *meth);
+            }
+            bclose(s, item.span);
         }
-        bclose(s, item.span);
       }
       ast::item_trait(ref generics, ref traits, ref methods) => {
         head(s, visibility_qualified(item.vis, "trait"));

trunk/src/test/auxiliary/trait_inheritance_overloading_xc.rs

@@ -35,6 +35,6 @@ impl Eq for MyInt {
     fn ne(&self, other: &MyInt) -> bool { !self.eq(other) }
 }
 
-impl MyNum for MyInt {}
+impl MyNum for MyInt;
 
 fn mi(v: int) -> MyInt { MyInt { val: v } }

trunk/src/test/compile-fail/missing-derivable-attr.rs

@@ -20,7 +20,7 @@ impl MyEq for int {
     fn eq(&self, other: &int) -> bool { *self == *other }
 }
 
-impl MyEq for A {}  //~ ERROR missing method
+impl MyEq for A;  //~ ERROR missing method
 
 fn main() {
 }

trunk/src/test/debug-info/generic-trait-generic-static-default-method.rs

@@ -40,7 +40,7 @@ trait Trait<T1> {
     }
 }
 
-impl<T> Trait<T> for Struct {}
+impl<T> Trait<T> for Struct;
 
 fn main() {
 

trunk/src/test/debug-info/self-in-default-method.rs

@@ -118,7 +118,7 @@ trait Trait {
     }
 }
 
-impl Trait for Struct {}
+impl Trait for Struct;
 
 fn main() {
     let stack = Struct { x: 100 };

trunk/src/test/debug-info/self-in-generic-default-method.rs

@@ -119,7 +119,7 @@ trait Trait {
     }
 }
 
-impl Trait for Struct {}
+impl Trait for Struct;
 
 fn main() {
     let stack = Struct { x: 987 };

trunk/src/test/debug-info/trait-generic-static-default-method.rs

@@ -40,7 +40,7 @@ trait Trait {
     }
 }
 
-impl Trait for Struct {}
+impl Trait for Struct;
 
 fn main() {
 

trunk/src/test/pretty/empty-impl.pp

@@ -1,5 +1,5 @@
 trait X { }
-impl X for uint { }
+impl X for uint;
 
 trait Y { }
-impl Y for uint { }
+impl Y for uint;

trunk/src/test/pretty/empty-impl.rs

@@ -1,5 +1,5 @@
 trait X { }
-impl X for uint { }
+impl X for uint;
 
 trait Y { }
-impl Y for uint { }
+impl Y for uint;

trunk/src/test/pretty/path-type-bounds.rs

@@ -1,7 +1,7 @@
 // pp-exact
 
 trait Tr { }
-impl Tr for int { }
+impl Tr for int;
 
 fn foo(x: ~Tr: Freeze) -> ~Tr: Freeze { x }
 

trunk/src/test/run-pass/default-method-supertrait-vtable.rs

@@ -29,7 +29,7 @@ impl Y for int {
     fn y(self) -> int { self }
 }
 
-impl Z for int {}
+impl Z for int;
 
 fn main() {
     assert_eq!(12.x(), 12);

trunk/src/test/run-pass/issue-3979-generics.rs

@@ -31,7 +31,7 @@ impl Positioned<int> for Point {
     }
 }
 
-impl Movable<int> for Point {}
+impl Movable<int> for Point;
 
 pub fn main() {
     let mut p = Point{ x: 1, y: 2};

trunk/src/test/run-pass/issue-3979-xcrate.rs

@@ -24,7 +24,7 @@ impl Positioned for Point {
     }
 }
 
-impl Movable for Point {}
+impl Movable for Point;
 
 pub fn main() {
     let mut p = Point{ x: 1, y: 2};

trunk/src/test/run-pass/issue-3979.rs

@@ -32,7 +32,7 @@ impl Positioned for Point {
     }
 }
 
-impl Movable for Point {}
+impl Movable for Point;
 
 pub fn main() {
     let mut p = Point{ x: 1, y: 2};

trunk/src/test/run-pass/supertrait-default-generics.rs

@@ -33,7 +33,7 @@ impl<S: Clone> Positioned<S> for Point<S> {
     }
 }
 
-impl<S: Clone + Add<S, S>> Movable<S> for Point<S> {}
+impl<S: Clone + Add<S, S>> Movable<S> for Point<S>;
 
 pub fn main() {
     let mut p = Point{ x: 1, y: 2};

trunk/src/test/run-pass/trait-inheritance-overloading-simple.rs

@@ -19,7 +19,7 @@ impl Eq for MyInt {
     fn ne(&self, other: &MyInt) -> bool { !self.eq(other) }
 }
 
-impl MyNum for MyInt {}
+impl MyNum for MyInt;
 
 fn f<T:MyNum>(x: T, y: T) -> bool {
     return x == y;

trunk/src/test/run-pass/trait-inheritance-overloading.rs

@@ -31,7 +31,7 @@ impl Eq for MyInt {
     fn ne(&self, other: &MyInt) -> bool { !self.eq(other) }
 }
 
-impl MyNum for MyInt {}
+impl MyNum for MyInt;
 
 fn f<T:MyNum>(x: T, y: T) -> (T, T, T) {
     return (x + y, x - y, x * y);

trunk/src/test/run-pass/trait-inheritance-subst.rs

@@ -20,7 +20,7 @@ impl Add<MyInt, MyInt> for MyInt {
     fn add(&self, other: &MyInt) -> MyInt { mi(self.val + other.val) }
 }
 
-impl MyNum for MyInt {}
+impl MyNum for MyInt;
 
 fn f<T:MyNum>(x: T, y: T) -> T {
     return x.add(&y);

trunk/src/test/run-pass/trait-inheritance-subst2.rs

@@ -30,7 +30,7 @@ impl Add<MyInt, MyInt> for MyInt {
     fn add(&self, other: &MyInt) -> MyInt { self.chomp(other) }
 }
 
-impl MyNum for MyInt {}
+impl MyNum for MyInt;
 
 fn f<T:MyNum>(x: T, y: T) -> T {
     return x.add(&y).chomp(&y);

trunk/src/test/run-pass/trait-inheritance2.rs

@@ -19,7 +19,7 @@ struct A { x: int }
 impl Foo for A { fn f(&self) -> int { 10 } }
 impl Bar for A { fn g(&self) -> int { 20 } }
 impl Baz for A { fn h(&self) -> int { 30 } }
-impl Quux for A {}
+impl Quux for A;
 
 fn f<T:Quux + Foo + Bar + Baz>(a: &T) {
     assert_eq!(a.f(), 10);