about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-08-18 05:11:58 -0700
committerbors <bors@rust-lang.org>2013-08-18 05:11:58 -0700
commit3bc685842802edfcd2918f911268f8e345cf3c26 (patch)
tree7ef40025a4a23dfcd30b30ba648f360fa6fa6d04 /src/libsyntax
parent600901152c223faad80d7cb419cecccd71803723 (diff)
parent6440343a6c26fca12ef2e323fa7738dce9da1986 (diff)
downloadrust-3bc685842802edfcd2918f911268f8e345cf3c26.tar.gz
rust-3bc685842802edfcd2918f911268f8e345cf3c26.zip
auto merge of #8551 : huonw/rust/speling, r=alexcrichton
(This doesn't add/remove `u`s or change `ize` to `ise`, or anything like that.)
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ast.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 17247222c3f..b01c19a59c1 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -100,7 +100,7 @@ pub struct Lifetime {
 }
 
 // a "Path" is essentially Rust's notion of a name;
-// for instance: core::cmp::Eq  .  It's represented
+// for instance: std::cmp::Eq  .  It's represented
 // as a sequence of identifiers, along with a bunch
 // of supporting information.
 #[deriving(Clone, Eq, Encodable, Decodable, IterBytes)]
@@ -1093,8 +1093,8 @@ pub enum inlined_item {
 /* hold off on tests ... they appear in a later merge.
 #[cfg(test)]
 mod test {
-    use core::option::{None, Option, Some};
-    use core::uint;
+    use std::option::{None, Option, Some};
+    use std::uint;
     use extra;
     use codemap::*;
     use super::*;