---

yaml
---
r: 273391
b: refs/heads/beta
c: 77eb78a
h: refs/heads/master
i:
  273389: 6bfa9ef
  273387: 5bcc1ec
  273383: cd300b8
  273375: c244f9e

Author: frewsxcv

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 4238d0b639d4ead97d9cf4ffbb049c0573239cac
+refs/heads/beta: 77eb78a8c583e17f0cf98a433eb42aa0fc63ce4f
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_driver/lib.rs

@@ -335,10 +335,10 @@ pub struct RustcDefaultCalls;
 fn handle_explain(code: &str,
                   descriptions: &diagnostics::registry::Registry,
                   output: ErrorOutputType) {
-    let normalised = if !code.starts_with("E") {
-        format!("E{0:0>4}", code)
-    } else {
+    let normalised = if code.starts_with("E") {
         code.to_string()
+    } else {
+        format!("E{0:0>4}", code)
     };
     match descriptions.find_description(&normalised) {
         Some(ref description) => {
@@ -916,10 +916,10 @@ pub fn handle_options(args: &[String]) -> Option<getopts::Matches> {
         if opt.stability == OptionStability::Stable {
             continue
         }
-        let opt_name = if !opt.opt_group.long_name.is_empty() {
-            &opt.opt_group.long_name
-        } else {
+        let opt_name = if opt.opt_group.long_name.is_empty() {
             &opt.opt_group.short_name
+        } else {
+            &opt.opt_group.long_name
         };
         if !matches.opt_present(opt_name) {
             continue