about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/fmt/mod.rs2
-rw-r--r--src/libstd/fmt/parse.rs18
-rw-r--r--src/libstd/hashmap.rs2
-rw-r--r--src/libstd/io/fs.rs36
-rw-r--r--src/libstd/io/mod.rs2
-rw-r--r--src/libstd/io/native/file.rs2
-rw-r--r--src/libstd/io/native/process.rs2
-rw-r--r--src/libstd/io/net/ip.rs4
-rw-r--r--src/libstd/io/stdio.rs8
-rw-r--r--src/libstd/lib.rs4
-rw-r--r--src/libstd/os.rs2
-rw-r--r--src/libstd/repr.rs2
-rw-r--r--src/libstd/result.rs4
-rw-r--r--src/libstd/rt/context.rs4
-rw-r--r--src/libstd/rt/local_ptr.rs3
-rw-r--r--src/libstd/rt/mod.rs2
-rw-r--r--src/libstd/rt/sched.rs2
-rw-r--r--src/libstd/rt/task.rs8
-rw-r--r--src/libstd/trie.rs4
-rw-r--r--src/libstd/unstable/intrinsics.rs1
-rw-r--r--src/libstd/unstable/sync.rs2
-rw-r--r--src/libstd/util.rs2
22 files changed, 56 insertions, 60 deletions
diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs
index 33ef4731405..9fa2c7ab1f3 100644
--- a/src/libstd/fmt/mod.rs
+++ b/src/libstd/fmt/mod.rs
@@ -768,7 +768,7 @@ impl<'self> Formatter<'self> {
                         Left(parse::Few) => value < 8,
                         Left(parse::Many) => value >= 8,
 
-                        Right(*) => false
+                        Right(..) => false
                     };
                     if run {
                         return self.runplural(value, s.result);
diff --git a/src/libstd/fmt/parse.rs b/src/libstd/fmt/parse.rs
index 885fe75fb9f..6489ff79205 100644
--- a/src/libstd/fmt/parse.rs
+++ b/src/libstd/fmt/parse.rs
@@ -217,7 +217,7 @@ impl<'self> Parser<'self> {
                 self.cur.next();
                 true
             }
-            Some(*) | None => false,
+            Some(..) | None => false,
         }
     }
 
@@ -251,7 +251,7 @@ impl<'self> Parser<'self> {
         loop {
             match self.cur.clone().next() {
                 Some((_, c)) if char::is_whitespace(c) => { self.cur.next(); }
-                Some(*) | None => { return }
+                Some(..) | None => { return }
             }
         }
     }
@@ -284,7 +284,7 @@ impl<'self> Parser<'self> {
                 Some((pos, '}')) | Some((pos, '{')) => {
                     return self.input.slice(start, pos);
                 }
-                Some(*) => { self.cur.next(); }
+                Some(..) => { self.cur.next(); }
                 None => {
                     self.cur.next();
                     return self.input.slice(start, self.input.len());
@@ -340,7 +340,7 @@ impl<'self> Parser<'self> {
                         spec.fill = Some(c);
                         self.cur.next();
                     }
-                    Some(*) | None => {}
+                    Some(..) | None => {}
                 }
             }
             None => {}
@@ -449,7 +449,7 @@ impl<'self> Parser<'self> {
             self.ws();
             match self.cur.clone().next() {
                 Some((_, '}')) => { break }
-                Some(*) | None => {}
+                Some(..) | None => {}
             }
         }
         // The "other" selector must be present
@@ -493,10 +493,10 @@ impl<'self> Parser<'self> {
                             }
                         }
                     }
-                    Some(*) | None => {}
+                    Some(..) | None => {}
                 }
             }
-            Some(*) | None => {}
+            Some(..) | None => {}
         }
 
         // Next, generate all the arms
@@ -547,7 +547,7 @@ impl<'self> Parser<'self> {
             self.ws();
             match self.cur.clone().next() {
                 Some((_, '}')) => { break }
-                Some(*) | None => {}
+                Some(..) | None => {}
             }
         }
 
@@ -597,7 +597,7 @@ impl<'self> Parser<'self> {
                 self.cur.next();
                 pos
             }
-            Some(*) | None => { return self.input.slice(0, 0); }
+            Some(..) | None => { return self.input.slice(0, 0); }
         };
         let mut end;
         loop {
diff --git a/src/libstd/hashmap.rs b/src/libstd/hashmap.rs
index a61871cbb5e..e7eb8e60704 100644
--- a/src/libstd/hashmap.rs
+++ b/src/libstd/hashmap.rs
@@ -577,7 +577,7 @@ impl<K, V> Iterator<(K, V)> for HashMapMoveIterator<K, V> {
     fn next(&mut self) -> Option<(K, V)> {
         for elt in self.iter {
             match elt {
-                Some(Bucket {key, value, _}) => return Some((key, value)),
+                Some(Bucket {key, value, ..}) => return Some((key, value)),
                 None => {},
             }
         }
diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs
index d1502df047e..a4be74d1d7f 100644
--- a/src/libstd/io/fs.rs
+++ b/src/libstd/io/fs.rs
@@ -678,7 +678,7 @@ impl path::Path {
     pub fn is_file(&self) -> bool {
         match io::result(|| self.stat()) {
             Ok(s) => s.kind == io::TypeFile,
-            Err(*) => false
+            Err(..) => false
         }
     }
 
@@ -693,7 +693,7 @@ impl path::Path {
     pub fn is_dir(&self) -> bool {
         match io::result(|| self.stat()) {
             Ok(s) => s.kind == io::TypeDirectory,
-            Err(*) => false
+            Err(..) => false
         }
     }
 }
@@ -1027,8 +1027,8 @@ mod test {
         let from = Path::new("test/nonexistent-bogus-path");
         let to = Path::new("test/other-bogus-path");
         match io::result(|| copy(&from, &to)) {
-            Ok(*) => fail!(),
-            Err(*) => {
+            Ok(..) => fail!(),
+            Err(..) => {
                 assert!(!from.exists());
                 assert!(!to.exists());
             }
@@ -1054,7 +1054,7 @@ mod test {
 
         File::create(&out);
         match io::result(|| copy(&out, &*tmpdir)) {
-            Ok(*) => fail!(), Err(*) => {}
+            Ok(..) => fail!(), Err(..) => {}
         }
     })
 
@@ -1076,7 +1076,7 @@ mod test {
         let out = tmpdir.join("out");
 
         match io::result(|| copy(&*tmpdir, &out)) {
-            Ok(*) => fail!(), Err(*) => {}
+            Ok(..) => fail!(), Err(..) => {}
         }
         assert!(!out.exists());
     })
@@ -1121,8 +1121,8 @@ mod test {
     test!(fn readlink_not_symlink() {
         let tmpdir = tmpdir();
         match io::result(|| readlink(&*tmpdir)) {
-            Ok(*) => fail!("wanted a failure"),
-            Err(*) => {}
+            Ok(..) => fail!("wanted a failure"),
+            Err(..) => {}
         }
     })
 
@@ -1142,13 +1142,13 @@ mod test {
 
         // can't link to yourself
         match io::result(|| link(&input, &input)) {
-            Ok(*) => fail!("wanted a failure"),
-            Err(*) => {}
+            Ok(..) => fail!("wanted a failure"),
+            Err(..) => {}
         }
         // can't link to something that doesn't exist
         match io::result(|| link(&tmpdir.join("foo"), &tmpdir.join("bar"))) {
-            Ok(*) => fail!("wanted a failure"),
-            Err(*) => {}
+            Ok(..) => fail!("wanted a failure"),
+            Err(..) => {}
         }
     })
 
@@ -1162,8 +1162,8 @@ mod test {
         assert!(stat(&file).perm & io::UserWrite == 0);
 
         match io::result(|| chmod(&tmpdir.join("foo"), io::UserRWX)) {
-            Ok(*) => fail!("wanted a failure"),
-            Err(*) => {}
+            Ok(..) => fail!("wanted a failure"),
+            Err(..) => {}
         }
 
         chmod(&file, io::UserFile);
@@ -1218,7 +1218,7 @@ mod test {
 
         match io::result(|| File::open_mode(&tmpdir.join("a"), io::Open,
                                             io::Read)) {
-            Ok(*) => fail!(), Err(*) => {}
+            Ok(..) => fail!(), Err(..) => {}
         }
         File::open_mode(&tmpdir.join("b"), io::Open, io::Write).unwrap();
         File::open_mode(&tmpdir.join("c"), io::Open, io::ReadWrite).unwrap();
@@ -1233,7 +1233,7 @@ mod test {
             let mut f = File::open_mode(&tmpdir.join("h"), io::Open,
                                         io::Read).unwrap();
             match io::result(|| f.write("wut".as_bytes())) {
-                Ok(*) => fail!(), Err(*) => {}
+                Ok(..) => fail!(), Err(..) => {}
             }
         }
         assert_eq!(stat(&tmpdir.join("h")).size, 3);
@@ -1267,8 +1267,8 @@ mod test {
         let tmpdir = tmpdir();
 
         match io::result(|| change_file_times(&tmpdir.join("a"), 100, 200)) {
-            Ok(*) => fail!(),
-            Err(*) => {}
+            Ok(..) => fail!(),
+            Err(..) => {}
         }
     }
 }
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 8cc4e7b389b..8b680020fd9 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -1047,7 +1047,7 @@ pub trait Buffer: Reader {
         let mut buf = [0, ..4];
         match self.read(buf.mut_slice_to(width)) {
             Some(n) if n == width => {}
-            Some(*) | None => return None // read error
+            Some(..) | None => return None // read error
         }
         match str::from_utf8_slice_opt(buf.slice_to(width)) {
             Some(s) => Some(s.char_at(0)),
diff --git a/src/libstd/io/native/file.rs b/src/libstd/io/native/file.rs
index 9dd6daf66e9..218040b72d6 100644
--- a/src/libstd/io/native/file.rs
+++ b/src/libstd/io/native/file.rs
@@ -114,7 +114,7 @@ impl FileDesc {
 
 impl io::Reader for FileDesc {
     fn read(&mut self, buf: &mut [u8]) -> Option<uint> {
-        match self.inner_read(buf) { Ok(n) => Some(n), Err(*) => None }
+        match self.inner_read(buf) { Ok(n) => Some(n), Err(..) => None }
     }
     fn eof(&mut self) -> bool { false }
 }
diff --git a/src/libstd/io/native/process.rs b/src/libstd/io/native/process.rs
index 038b6ec0ff2..1b614852737 100644
--- a/src/libstd/io/native/process.rs
+++ b/src/libstd/io/native/process.rs
@@ -129,7 +129,7 @@ impl rtio::RtioProcess for Process {
         // and we kill it, then on unix we might ending up killing a
         // newer process that happens to have the same (re-used) id
         match self.exit_code {
-            Some(*) => return Err(io::IoError {
+            Some(..) => return Err(io::IoError {
                 kind: io::OtherIoError,
                 desc: "can't kill an exited process",
                 detail: None,
diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs
index e089628b9c7..6a97a21673d 100644
--- a/src/libstd/io/net/ip.rs
+++ b/src/libstd/io/net/ip.rs
@@ -56,8 +56,8 @@ pub struct SocketAddr {
 impl ToStr for SocketAddr {
     fn to_str(&self) -> ~str {
         match self.ip {
-            Ipv4Addr(*) => format!("{}:{}", self.ip.to_str(), self.port),
-            Ipv6Addr(*) => format!("[{}]:{}", self.ip.to_str(), self.port),
+            Ipv4Addr(..) => format!("{}:{}", self.ip.to_str(), self.port),
+            Ipv6Addr(..) => format!("[{}]:{}", self.ip.to_str(), self.port),
         }
     }
 }
diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs
index 2aa8b0c7ed6..fe0385c9a95 100644
--- a/src/libstd/io/stdio.rs
+++ b/src/libstd/io/stdio.rs
@@ -247,7 +247,7 @@ impl StdWriter {
                     }
                 }
             }
-            File(*) => {
+            File(..) => {
                 io_error::cond.raise(IoError {
                     kind: OtherIoError,
                     desc: "stream is not a tty",
@@ -273,7 +273,7 @@ impl StdWriter {
                     Err(e) => io_error::cond.raise(e),
                 }
             }
-            File(*) => {
+            File(..) => {
                 io_error::cond.raise(IoError {
                     kind: OtherIoError,
                     desc: "stream is not a tty",
@@ -286,8 +286,8 @@ impl StdWriter {
     /// Returns whether this stream is attached to a TTY instance or not.
     pub fn isatty(&self) -> bool {
         match self.inner {
-            TTY(*) => true,
-            File(*) => false,
+            TTY(..) => true,
+            File(..) => false,
         }
     }
 }
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 7a8b4467fcc..a72bc6b8328 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -57,15 +57,13 @@
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
-#[feature(macro_rules, globs, asm, managed_boxes)];
+#[feature(macro_rules, globs, asm, managed_boxes, thread_local)];
 
 // Don't link to std. We are std.
 #[no_std];
 
 #[deny(non_camel_case_types)];
 #[deny(missing_doc)];
-#[allow(unrecognized_lint)]; // NOTE: remove after the next snapshot
-#[allow(cstack)]; // NOTE: remove after the next snapshot.
 
 // When testing libstd, bring in libuv as the I/O backend so tests can print
 // things and all of the std::io tests have an I/O interface to run on top
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index baa4423220c..34331769614 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -386,7 +386,7 @@ pub fn self_exe_path() -> Option<Path> {
 
         match io::result(|| io::fs::readlink(&Path::new("/proc/self/exe"))) {
             Ok(Some(path)) => Some(path.as_vec().to_owned()),
-            Ok(None) | Err(*) => None
+            Ok(None) | Err(..) => None
         }
     }
 
diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs
index d26989c36e6..081673e86cb 100644
--- a/src/libstd/repr.rs
+++ b/src/libstd/repr.rs
@@ -550,7 +550,7 @@ impl<'self> TyVisitor for ReprVisitor<'self> {
                         _align: uint)
                         -> bool {
         match self.var_stk.pop() {
-            SearchingFor(*) => fail!("enum value matched no variant"),
+            SearchingFor(..) => fail!("enum value matched no variant"),
             _ => true
         }
     }
diff --git a/src/libstd/result.rs b/src/libstd/result.rs
index ff425a8a73b..afcf092b4f6 100644
--- a/src/libstd/result.rs
+++ b/src/libstd/result.rs
@@ -178,7 +178,7 @@ impl<T, E: ToStr> Result<T, E> {
     pub fn iter<'r>(&'r self) -> OptionIterator<&'r T> {
         match *self {
             Ok(ref t) => Some(t),
-            Err(*) => None,
+            Err(..) => None,
         }.move_iter()
     }
 
@@ -186,7 +186,7 @@ impl<T, E: ToStr> Result<T, E> {
     #[inline]
     pub fn iter_err<'r>(&'r self) -> OptionIterator<&'r E> {
         match *self {
-            Ok(*) => None,
+            Ok(..) => None,
             Err(ref t) => Some(t),
         }.move_iter()
     }
diff --git a/src/libstd/rt/context.rs b/src/libstd/rt/context.rs
index 8998064990a..418557f659b 100644
--- a/src/libstd/rt/context.rs
+++ b/src/libstd/rt/context.rs
@@ -97,10 +97,10 @@ impl Context {
     pub fn swap(out_context: &mut Context, in_context: &Context) {
         rtdebug!("swapping contexts");
         let out_regs: &mut Registers = match out_context {
-            &Context { regs: ~ref mut r, _ } => r
+            &Context { regs: ~ref mut r, .. } => r
         };
         let in_regs: &Registers = match in_context {
-            &Context { regs: ~ref r, _ } => r
+            &Context { regs: ~ref r, .. } => r
         };
 
         rtdebug!("noting the stack limit and doing raw swap");
diff --git a/src/libstd/rt/local_ptr.rs b/src/libstd/rt/local_ptr.rs
index c50a9778d33..803938589af 100644
--- a/src/libstd/rt/local_ptr.rs
+++ b/src/libstd/rt/local_ptr.rs
@@ -21,10 +21,9 @@ use unstable::finally::Finally;
 
 #[cfg(windows)]               // mingw-w32 doesn't like thread_local things
 #[cfg(target_os = "android")] // see #10686
-#[cfg(stage0)] // only remove this attribute after the next snapshot
 pub use self::native::*;
 
-#[cfg(not(stage0), not(windows), not(target_os = "android"))]
+#[cfg(not(windows), not(target_os = "android"))]
 pub use self::compiled::*;
 
 /// Borrow the thread-local value from thread-local storage.
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs
index 0c69315b27d..78ec32ead3c 100644
--- a/src/libstd/rt/mod.rs
+++ b/src/libstd/rt/mod.rs
@@ -96,7 +96,7 @@ pub mod shouldnt_be_public {
     pub use super::select::SelectInner;
     pub use super::select::{SelectInner, SelectPortInner};
     pub use super::local_ptr::native::maybe_tls_key;
-    #[cfg(not(stage0), not(windows), not(target_os = "android"))]
+    #[cfg(not(windows), not(target_os = "android"))]
     pub use super::local_ptr::compiled::RT_TLS_PTR;
 }
 
diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs
index 21753d9e4d9..d66bd1e4135 100644
--- a/src/libstd/rt/sched.rs
+++ b/src/libstd/rt/sched.rs
@@ -588,7 +588,7 @@ impl Scheduler {
                 transmute_mut_region(*next_task.sched.get_mut_ref());
 
             let current_task: &mut Task = match sched.cleanup_job {
-                Some(CleanupJob { task: ref task, _ }) => {
+                Some(CleanupJob { task: ref task, .. }) => {
                     let task_ptr: *~Task = task;
                     transmute_mut_region(*transmute_mut_unsafe(task_ptr))
                 }
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs
index 68164eb9345..e5f7c08912a 100644
--- a/src/libstd/rt/task.rs
+++ b/src/libstd/rt/task.rs
@@ -335,7 +335,7 @@ impl Task {
     pub fn is_home_no_tls(&self, sched: &~Scheduler) -> bool {
         match self.task_type {
             GreenTask(Some(AnySched)) => { false }
-            GreenTask(Some(Sched(SchedHandle { sched_id: ref id, _}))) => {
+            GreenTask(Some(Sched(SchedHandle { sched_id: ref id, .. }))) => {
                 *id == sched.sched_id()
             }
             GreenTask(None) => {
@@ -351,7 +351,7 @@ impl Task {
     pub fn homed(&self) -> bool {
         match self.task_type {
             GreenTask(Some(AnySched)) => { false }
-            GreenTask(Some(Sched(SchedHandle { _ }))) => { true }
+            GreenTask(Some(Sched(SchedHandle { .. }))) => { true }
             GreenTask(None) => {
                 rtabort!("task without home");
             }
@@ -372,7 +372,7 @@ impl Task {
                     rtdebug!("anysched task in sched check ****");
                     sched_run_anything
                 }
-                GreenTask(Some(Sched(SchedHandle { sched_id: ref id, _ }))) => {
+                GreenTask(Some(Sched(SchedHandle { sched_id: ref id, ..}))) => {
                     rtdebug!("homed task in sched check ****");
                     *id == sched_id
                 }
@@ -470,7 +470,7 @@ impl Coroutine {
     /// Destroy coroutine and try to reuse stack segment.
     pub fn recycle(self, stack_pool: &mut StackPool) {
         match self {
-            Coroutine { current_stack_segment, _ } => {
+            Coroutine { current_stack_segment, .. } => {
                 stack_pool.give_segment(current_stack_segment);
             }
         }
diff --git a/src/libstd/trie.rs b/src/libstd/trie.rs
index 8b534d7d3be..97209e99bd6 100644
--- a/src/libstd/trie.rs
+++ b/src/libstd/trie.rs
@@ -374,7 +374,7 @@ fn chunk(n: uint, idx: uint) -> uint {
 fn find_mut<'r, T>(child: &'r mut Child<T>, key: uint, idx: uint) -> Option<&'r mut T> {
     match *child {
         External(stored, ref mut value) if stored == key => Some(value),
-        External(*) => None,
+        External(..) => None,
         Internal(ref mut x) => find_mut(&mut x.children[chunk(key, idx)], key, idx + 1),
         Nothing => None
     }
@@ -426,7 +426,7 @@ fn remove<T>(count: &mut uint, child: &mut Child<T>, key: uint,
             _ => fail!()
         }
       }
-      External(*) => (None, false),
+      External(..) => (None, false),
       Internal(ref mut x) => {
           let ret = remove(&mut x.count, &mut x.children[chunk(key, idx)],
                            key, idx + 1);
diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
index ea3ed10da4e..89a51a5dddd 100644
--- a/src/libstd/unstable/intrinsics.rs
+++ b/src/libstd/unstable/intrinsics.rs
@@ -177,7 +177,6 @@ extern "rust-intrinsic" {
     pub fn abort() -> !;
 
     /// Execute a breakpoint trap, for inspection by a debugger.
-    #[cfg(not(stage0))]
     pub fn breakpoint();
 
     /// Atomic compare and exchange, sequentially consistent.
diff --git a/src/libstd/unstable/sync.rs b/src/libstd/unstable/sync.rs
index 03745c2c348..02b35992f8c 100644
--- a/src/libstd/unstable/sync.rs
+++ b/src/libstd/unstable/sync.rs
@@ -455,7 +455,7 @@ impl<T:Send> Exclusive<T> {
         let Exclusive { x: x } = self;
         // Someday we might need to unkillably unwrap an Exclusive, but not today.
         let inner = x.unwrap();
-        let ExData { data: user_data, _ } = inner; // will destroy the LittleLock
+        let ExData { data: user_data, .. } = inner; // will destroy the LittleLock
         user_data
     }
 }
diff --git a/src/libstd/util.rs b/src/libstd/util.rs
index ddcf408189e..d75c60c0bf2 100644
--- a/src/libstd/util.rs
+++ b/src/libstd/util.rs
@@ -209,7 +209,7 @@ mod bench {
         let x = [1,2,3,4,5,6];
         bh.iter(|| {
             let _q = match x {
-                [1,2,3,.._] => 10,
+                [1,2,3,..] => 10,
                 _ => 11
             };
         });
generated by cgit-pink 1.4.1-3-g733a5 (git 2.37.1) at 2026-03-13 05:17:15 +0000