diff options
| author | bors <bors@rust-lang.org> | 2013-10-21 19:26:19 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-21 19:26:19 -0700 |
| commit | f6fccdea8a16c276fa72c8faa35e8d568612e964 (patch) | |
| tree | 49909c2ffc0ac805451eaada0d1ec757ff49690d /src | |
| parent | 8a60caa107b7a55f480ae60a5184bd2e2a6319e7 (diff) | |
| parent | 3503d0bcd19d9c6ce80961fd1d972afb64963cd9 (diff) | |
| download | rust-f6fccdea8a16c276fa72c8faa35e8d568612e964.tar.gz rust-f6fccdea8a16c276fa72c8faa35e8d568612e964.zip | |
auto merge of #9982 : danluu/rust/local_delc_xfail, r=brson
This patch is trivial, but it comes with a question. Does Mozilla need to own the copyright on code submitted to Rust? The reason I ask is that, since the last time I submitted anything to a Mozilla project, I started working at Google, and they (by default) own the copyright on code that I write (even in my spare time). There's a process to assign copyright to another entity, and it should be a formality for something like this, but I'd still have to go through it if that's a requirement for Rust. Anyway, I'm submitting this incredibly trivial thing because, if I have to go through that process for the first time, I'd like it to be for something that's trivial, so I can see how much of a hassle it is (if any) without having invested much time up front. I didn't see anything about copyright in the Mozilla contributor's agreement, but I could have easily missed something somewhere else.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs b/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs index 2d42088fc14..2d0b4f37b2f 100644 --- a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs +++ b/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs @@ -1,5 +1,3 @@ -// xfail-test FIXME #6257 - // Copyright 2013 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. @@ -16,9 +14,8 @@ use std::cmp::{Less,Equal,Greater}; struct A<'self> { x: &'self int } - -fn main() { - let a = A { x: &1 }, b = A { x: &2 }; +pub fn main() { + let (a, b) = (A { x: &1 }, A { x: &2 }); assert!(a.equals(&a)); assert!(b.equals(&b)); |
