diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-07-10 17:31:53 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-07-17 14:57:54 -0700 |
| commit | 88fe4ae09c2240fcb10fef98a0f5a61559849902 (patch) | |
| tree | 029c1eba9ae511f5a48149ef0fdc9987ec3e6b6c /src/libstd | |
| parent | d57e8f841939c433b541dd185af91483a88f0f4d (diff) | |
| download | rust-88fe4ae09c2240fcb10fef98a0f5a61559849902.tar.gz rust-88fe4ae09c2240fcb10fef98a0f5a61559849902.zip | |
librustc: Remove the `Copy` bound from the language.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io.rs | 3 | ||||
| -rw-r--r-- | src/libstd/kinds.rs | 1 | ||||
| -rw-r--r-- | src/libstd/os.rs | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/src/libstd/io.rs b/src/libstd/io.rs index 338f9335806..92b112bda1f 100644 --- a/src/libstd/io.rs +++ b/src/libstd/io.rs @@ -1559,7 +1559,6 @@ impl<T:Writer> WriterUtil for T { } -#[allow(non_implicitly_copyable_typarams)] pub fn file_writer(path: &Path, flags: &[FileFlag]) -> Result<@Writer, ~str> { mk_file_writer(path, flags).chain(|w| result::Ok(w)) } @@ -1727,7 +1726,6 @@ pub fn seek_in_buf(offset: int, pos: uint, len: uint, whence: SeekStyle) -> return bpos as uint; } -#[allow(non_implicitly_copyable_typarams)] pub fn read_whole_file_str(file: &Path) -> Result<~str, ~str> { result::chain(read_whole_file(file), |bytes| { if str::is_utf8(bytes) { @@ -1740,7 +1738,6 @@ pub fn read_whole_file_str(file: &Path) -> Result<~str, ~str> { // FIXME (#2004): implement this in a low-level way. Going through the // abstractions is pointless. -#[allow(non_implicitly_copyable_typarams)] pub fn read_whole_file(file: &Path) -> Result<~[u8], ~str> { result::chain(file_reader(file), |rdr| { result::Ok(rdr.read_whole_stream()) diff --git a/src/libstd/kinds.rs b/src/libstd/kinds.rs index f2f8f46e7cd..f13eeece2f4 100644 --- a/src/libstd/kinds.rs +++ b/src/libstd/kinds.rs @@ -29,6 +29,7 @@ The 2 kinds are #[allow(missing_doc)]; +#[cfg(stage0)] #[lang="copy"] pub trait Copy { // Empty. diff --git a/src/libstd/os.rs b/src/libstd/os.rs index c54cf3910bd..a7e3fec51a7 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -577,13 +577,11 @@ pub fn tmpdir() -> Path { } #[cfg(unix)] - #[allow(non_implicitly_copyable_typarams)] fn lookup() -> Path { getenv_nonempty("TMPDIR").get_or_default(Path("/tmp")) } #[cfg(windows)] - #[allow(non_implicitly_copyable_typarams)] fn lookup() -> Path { getenv_nonempty("TMP").or( getenv_nonempty("TEMP").or( @@ -688,7 +686,6 @@ pub fn mkdir_recursive(p: &Path, mode: c_int) -> bool { } /// Lists the contents of a directory -#[allow(non_implicitly_copyable_typarams)] pub fn list_dir(p: &Path) -> ~[~str] { if p.components.is_empty() && !p.is_absolute() { // Not sure what the right behavior is here, but this @@ -1732,7 +1729,6 @@ pub mod consts { } #[cfg(test)] -#[allow(non_implicitly_copyable_typarams)] mod tests { use libc::{c_int, c_void, size_t}; use libc; |
