---

yaml
---
r: 169717
b: refs/heads/master
c: f4a2672
h: refs/heads/master
i:
  169715: 962e963
v: v3

Author: Manishearth

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0bd022c893b00e0bb76d84bbbf8ccf7f685aad9c
+refs/heads/master: f4a26726000d2b2144b2f929ad0555868d85f32f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
 refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb

trunk/src/librustc/metadata/creader.rs

@@ -497,8 +497,8 @@ impl<'a> CrateReader<'a> {
         let register = should_link && self.existing_match(info.name.as_slice(), None).is_none();
         let metadata = if register {
             // Register crate now to avoid double-reading metadata
-            let (_, cmd, _) = self.register_crate(&None, info.ident[],
-                                info.name[], span, library);
+            let (_, cmd, _) = self.register_crate(&None, &info.ident[],
+                                &info.name[], span, library);
             PMDSource::Registered(cmd)
         } else {
             // Not registering the crate; just hold on to the metadata

trunk/src/librustc/session/config.rs

@@ -311,18 +311,20 @@ macro_rules! options {
                 if !setter(&mut op, value) {
                     match (value, opt_type_desc) {
                         (Some(..), None) => {
-                            early_error(format!("{} option `{}` takes no \
+                            early_error(&format!("{} option `{}` takes no \
                                                  value", $outputname, key)[])
                         }
                         (None, Some(type_desc)) => {
-                            early_error(format!("{0} option `{1}` requires \
+                            early_error(&format!("{0} option `{1}` requires \
                                                  {2} ({3} {1}=<value>)",
-                                                $outputname, key, type_desc, $prefix)[])
+                                                $outputname, key,
+                                                type_desc, $prefix)[])
                         }
                         (Some(value), Some(type_desc)) => {
-                            early_error(format!("incorrect value `{}` for {} \
+                            early_error(&format!("incorrect value `{}` for {} \
                                                  option `{}` - {} was expected",
-                                                 value, $outputname, key, type_desc)[])
+                                                 value, $outputname,
+                                                 key, type_desc)[])
                         }
                         (None, None) => unreachable!()
                     }
@@ -331,7 +333,7 @@ macro_rules! options {
                 break;
             }
             if !found {
-                early_error(format!("unknown codegen option: `{}`",
+                early_error(&format!("unknown codegen option: `{}`",
                                     key)[]);
             }
         }

trunk/src/test/run-pass-fulldeps/lint-plugin-cmdline.rs renamed to trunk/src/test/run-pass-fulldeps/lint-plugin-cmdline-allow.rs

@@ -0,0 +1,21 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// aux-build:lint_plugin_test.rs
+// ignore-stage1
+// ignore-pretty: Random space appears with the pretty test
+// compile-flags: -Z extra-plugins=lint_plugin_test
+
+fn lintme() { } //~ WARNING item is named 'lintme'
+
+#[allow(test_lint)]
+pub fn main() {
+    fn lintme() { }
+}