---

yaml
---
r: 142935
b: refs/heads/try2
c: 3f8d548
h: refs/heads/master
i:
  142933: 7d854f8
  142931: 9a3ca71
  142927: 4670db2
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 66a9b7d5bd725960b67deb3e3793e19a0ad3cea5
+refs/heads/try2: 3f8d548914fac1e7c32fcd9a903590d0fe21c64f
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/const_eval.rs

@@ -204,7 +204,11 @@ pub fn lookup_variant_by_id(tcx: ty::ctxt,
             capture_map: @mut HashMap::new()
         };
         match csearch::maybe_get_item_ast(tcx, enum_def,
-            |a, b, c, d| astencode::decode_inlined_item(a, b, maps, /*bar*/ copy c, d)) {
+            |a, b, c, d| astencode::decode_inlined_item(a,
+                                                        b,
+                                                        maps,
+                                                        /*bad*/ c.clone(),
+                                                        d)) {
             csearch::found(ast::ii_item(item)) => match item.node {
                 item_enum(ast::enum_def { variants: ref variants }, _) => {
                     variant_expr(*variants, variant_def.node)

branches/try2/src/librustc/middle/lint.rs

@@ -112,7 +112,7 @@ pub enum level {
     allow, warn, deny, forbid
 }
 
-#[deriving(Eq)]
+#[deriving(Clone, Eq)]
 pub struct LintSpec {
     lint: lint,
     desc: &'static str,

branches/try2/src/librustpkg/tests.rs

@@ -221,7 +221,7 @@ fn command_line_test_with_env(args: &[~str], cwd: &Path, env: Option<~[(~str, ~s
     let cwd = normalize(RemotePath((*cwd).clone()));
     debug!("About to run command: %? %? in %s", cmd, args, cwd.to_str());
     assert!(os::path_is_dir(&*cwd));
-    let cwd = cwd.clone();
+    let cwd = (*cwd).clone();
     let mut prog = run::Process::new(cmd, args, run::ProcessOptions {
         env: env.map(|v| v.slice(0, v.len())),
         dir: Some(&cwd),

branches/try2/src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -63,7 +63,7 @@ fn sort_and_fmt(mm: &HashMap<~[u8], uint>, total: uint) -> ~str {
 
    // map -> [(k,%)]
    for mm.iter().advance |(key, &val)| {
-      pairs.push((copy *key, pct(val, total)));
+      pairs.push(((*key).clone(), pct(val, total)));
    }
 
    let pairs_sorted = sortKV(pairs);