From 090040bf4037a094e50b03d79e4baf5cd89c912b Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Mon, 5 May 2014 18:56:44 -0700
Subject: librustc: Remove `~EXPR`, `~TYPE`, and `~PAT` from the language,
 except for `~str`/`~[]`.

Note that `~self` still remains, since I forgot to add support for
`Box<self>` before the snapshot.

How to update your code:

* Instead of `~EXPR`, you should write `box EXPR`.

* Instead of `~TYPE`, you should write `Box<Type>`.

* Instead of `~PATTERN`, you should write `box PATTERN`.

[breaking-change]
---
 src/libterm/lib.rs                      | 2 +-
 src/libterm/terminfo/parser/compiled.rs | 6 +++---
 src/libterm/terminfo/searcher.rs        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/libterm')

diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs
index 9e3be403065..416c9243106 100644
--- a/src/libterm/lib.rs
+++ b/src/libterm/lib.rs
@@ -114,7 +114,7 @@ fn cap_for_attr(attr: attr::Attr) -> &'static str {
 pub struct Terminal<T> {
     num_colors: u16,
     out: T,
-    ti: ~TermInfo
+    ti: Box<TermInfo>,
 }
 
 impl<T: Writer> Terminal<T> {
diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs
index db5dd2d5c19..2b50a20ac6a 100644
--- a/src/libterm/terminfo/parser/compiled.rs
+++ b/src/libterm/terminfo/parser/compiled.rs
@@ -159,8 +159,8 @@ pub static stringnames: &'static[&'static str] = &'static[ "cbt", "_", "cr", "cs
     "box1"];
 
 /// Parse a compiled terminfo entry, using long capability names if `longnames` is true
-pub fn parse(file: &mut io::Reader,
-             longnames: bool) -> Result<~TermInfo, ~str> {
+pub fn parse(file: &mut io::Reader, longnames: bool)
+             -> Result<Box<TermInfo>, ~str> {
     macro_rules! try( ($e:expr) => (
         match $e { Ok(e) => e, Err(e) => return Err(format!("{}", e)) }
     ) )
@@ -301,7 +301,7 @@ pub fn parse(file: &mut io::Reader,
 }
 
 /// Create a dummy TermInfo struct for msys terminals
-pub fn msys_terminfo() -> ~TermInfo {
+pub fn msys_terminfo() -> Box<TermInfo> {
     let mut strings = HashMap::new();
     strings.insert("sgr0".to_owned(), Vec::from_slice(bytes!("\x1b[0m")));
     strings.insert("bold".to_owned(), Vec::from_slice(bytes!("\x1b[1m")));
diff --git a/src/libterm/terminfo/searcher.rs b/src/libterm/terminfo/searcher.rs
index a491f7e863e..a4be7ed51fb 100644
--- a/src/libterm/terminfo/searcher.rs
+++ b/src/libterm/terminfo/searcher.rs
@@ -17,7 +17,7 @@ use std::os::getenv;
 use std::{os, str};
 
 /// Return path to database entry for `term`
-pub fn get_dbpath_for_term(term: &str) -> Option<~Path> {
+pub fn get_dbpath_for_term(term: &str) -> Option<Box<Path>> {
     if term.len() == 0 {
         return None;
     }
-- 
cgit 1.4.1-3-g733a5