464cdff102
This commit is the standard API stabilization commit for the 1.6 release cycle. The list of issues and APIs below have all been through their cycle-long FCP and the libs team decisions are listed below Stabilized APIs * `Read::read_exact` * `ErrorKind::UnexpectedEof` (renamed from `UnexpectedEOF`) * libcore -- this was a bit of a nuanced stabilization, the crate itself is now marked as `#[stable]` and the methods appearing via traits for primitives like `char` and `str` are now also marked as stable. Note that the extension traits themeselves are marked as unstable as they're imported via the prelude. The `try!` macro was also moved from the standard library into libcore to have the same interface. Otherwise the functions all have copied stability from the standard library now. * The `#![no_std]` attribute * `fs::DirBuilder` * `fs::DirBuilder::new` * `fs::DirBuilder::recursive` * `fs::DirBuilder::create` * `os::unix::fs::DirBuilderExt` * `os::unix::fs::DirBuilderExt::mode` * `vec::Drain` * `vec::Vec::drain` * `string::Drain` * `string::String::drain` * `vec_deque::Drain` * `vec_deque::VecDeque::drain` * `collections::hash_map::Drain` * `collections::hash_map::HashMap::drain` * `collections::hash_set::Drain` * `collections::hash_set::HashSet::drain` * `collections::binary_heap::Drain` * `collections::binary_heap::BinaryHeap::drain` * `Vec::extend_from_slice` (renamed from `push_all`) * `Mutex::get_mut` * `Mutex::into_inner` * `RwLock::get_mut` * `RwLock::into_inner` * `Iterator::min_by_key` (renamed from `min_by`) * `Iterator::max_by_key` (renamed from `max_by`) Deprecated APIs * `ErrorKind::UnexpectedEOF` (renamed to `UnexpectedEof`) * `OsString::from_bytes` * `OsStr::to_cstring` * `OsStr::to_bytes` * `fs::walk_dir` and `fs::WalkDir` * `path::Components::peek` * `slice::bytes::MutableByteVector` * `slice::bytes::copy_memory` * `Vec::push_all` (renamed to `extend_from_slice`) * `Duration::span` * `IpAddr` * `SocketAddr::ip` * `Read::tee` * `io::Tee` * `Write::broadcast` * `io::Broadcast` * `Iterator::min_by` (renamed to `min_by_key`) * `Iterator::max_by` (renamed to `max_by_key`) * `net::lookup_addr` New APIs (still unstable) * `<[T]>::sort_by_key` (added to mirror `min_by_key`) Closes #27585 Closes #27704 Closes #27707 Closes #27710 Closes #27711 Closes #27727 Closes #27740 Closes #27744 Closes #27799 Closes #27801 cc #27801 (doesn't close as `Chars` is still unstable) Closes #28968
88 lines
1.8 KiB
Rust
88 lines
1.8 KiB
Rust
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
|
|
#![feature(lang_items, unboxed_closures, fn_traits)]
|
|
|
|
use std::ops::{Fn, FnMut, FnOnce};
|
|
|
|
struct S1 {
|
|
x: i32,
|
|
y: i32,
|
|
}
|
|
|
|
impl FnMut<(i32,)> for S1 {
|
|
extern "rust-call" fn call_mut(&mut self, (z,): (i32,)) -> i32 {
|
|
self.x * self.y * z
|
|
}
|
|
}
|
|
|
|
impl FnOnce<(i32,)> for S1 {
|
|
type Output = i32;
|
|
extern "rust-call" fn call_once(mut self, args: (i32,)) -> i32 {
|
|
self.call_mut(args)
|
|
}
|
|
}
|
|
|
|
struct S2 {
|
|
x: i32,
|
|
y: i32,
|
|
}
|
|
|
|
impl Fn<(i32,)> for S2 {
|
|
extern "rust-call" fn call(&self, (z,): (i32,)) -> i32 {
|
|
self.x * self.y * z
|
|
}
|
|
}
|
|
|
|
impl FnMut<(i32,)> for S2 {
|
|
extern "rust-call" fn call_mut(&mut self, args: (i32,)) -> i32 { self.call(args) }
|
|
}
|
|
|
|
impl FnOnce<(i32,)> for S2 {
|
|
type Output = i32;
|
|
extern "rust-call" fn call_once(self, args: (i32,)) -> i32 { self.call(args) }
|
|
}
|
|
|
|
struct S3 {
|
|
x: i32,
|
|
y: i32,
|
|
}
|
|
|
|
impl FnOnce<(i32,i32)> for S3 {
|
|
type Output = i32;
|
|
extern "rust-call" fn call_once(self, (z,zz): (i32,i32)) -> i32 {
|
|
self.x * self.y * z * zz
|
|
}
|
|
}
|
|
|
|
fn main() {
|
|
let mut s = S1 {
|
|
x: 3,
|
|
y: 3,
|
|
};
|
|
let ans = s(3);
|
|
|
|
assert_eq!(ans, 27);
|
|
let s = S2 {
|
|
x: 3,
|
|
y: 3,
|
|
};
|
|
let ans = s.call((3,));
|
|
assert_eq!(ans, 27);
|
|
|
|
let s = S3 {
|
|
x: 3,
|
|
y: 3,
|
|
};
|
|
let ans = s(3, 1);
|
|
assert_eq!(ans, 27);
|
|
}
|