about summary refs log tree commit diff
path: root/src/libsyntax/parse/parser.rs
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2015-04-16 21:19:50 -0700
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2015-04-21 10:08:27 -0700
commit2937cce70c7c860b215f2d6f22f45c0dfe8ba914 (patch)
treed0d5c140d1798c75117efab252c1e566339c00d3 /src/libsyntax/parse/parser.rs
parent855365895228a78041ae16946eeaef5e45a37a64 (diff)
downloadrust-2937cce70c7c860b215f2d6f22f45c0dfe8ba914.tar.gz
rust-2937cce70c7c860b215f2d6f22f45c0dfe8ba914.zip
syntax: Replace String::from_str with the stable String::from
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
-rw-r--r--src/libsyntax/parse/parser.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index dd00ad31321..0fcf47d9e71 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -4834,7 +4834,7 @@ impl<'a> Parser<'a> {
         let mut included_mod_stack = self.sess.included_mod_stack.borrow_mut();
         match included_mod_stack.iter().position(|p| *p == path) {
             Some(i) => {
-                let mut err = String::from_str("circular modules: ");
+                let mut err = String::from("circular modules: ");
                 let len = included_mod_stack.len();
                 for p in &included_mod_stack[i.. len] {
                     err.push_str(&p.to_string_lossy());