diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 11:06:41 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 11:06:48 -0700 |
| commit | 8bc3838e91232010d69adc657fa3cefad5873a2a (patch) | |
| tree | cff63614814ab2de2103b6fa2e19f94f61c4effe /src/libsyntax | |
| parent | b24a3b82011c3b78573ace4ade3f99d7c4701a11 (diff) | |
| parent | 13e4270bf9468e9213b6cc16ca217062791599a0 (diff) | |
| download | rust-8bc3838e91232010d69adc657fa3cefad5873a2a.tar.gz rust-8bc3838e91232010d69adc657fa3cefad5873a2a.zip | |
Merge 'richo/unquote-crates' into less-quotes
Conflicts: src/libsyntax/parse/parser.rs
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/std_inject.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/std_inject.rs b/src/libsyntax/std_inject.rs index 0fa7e4f902c..021ec4738ed 100644 --- a/src/libsyntax/std_inject.rs +++ b/src/libsyntax/std_inject.rs @@ -52,7 +52,7 @@ struct StandardLibraryInjector { impl fold::Folder for StandardLibraryInjector { fn fold_crate(&mut self, mut krate: ast::Crate) -> ast::Crate { - // The name to use in `extern crate "name" as std;` + // The name to use in `extern crate name as std;` let actual_crate_name = match self.alt_std_name { Some(ref s) => token::intern(&s), None => token::intern("std"), |