diff options
| author | Richo Healey <richo@psych0tik.net> | 2014-05-22 16:57:53 -0700 |
|---|---|---|
| committer | Richo Healey <richo@psych0tik.net> | 2014-05-24 21:48:10 -0700 |
| commit | 553074506ecd139eb961fb91eb33ad9fd0183acb (patch) | |
| tree | 01682cf8147183250713acf5e8a77265aab7153c /src/libstd/local_data.rs | |
| parent | bbb70cdd9cd982922cf7390459d53bde409699ae (diff) | |
| download | rust-553074506ecd139eb961fb91eb33ad9fd0183acb.tar.gz rust-553074506ecd139eb961fb91eb33ad9fd0183acb.zip | |
core: rename strbuf::StrBuf to string::String
[breaking-change]
Diffstat (limited to 'src/libstd/local_data.rs')
| -rw-r--r-- | src/libstd/local_data.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libstd/local_data.rs b/src/libstd/local_data.rs index 2c7e16cf18b..2412e18bf62 100644 --- a/src/libstd/local_data.rs +++ b/src/libstd/local_data.rs @@ -276,7 +276,7 @@ mod tests { #[test] fn test_tls_multitask() { - static my_key: Key<StrBuf> = &Key; + static my_key: Key<String> = &Key; my_key.replace(Some("parent data".to_strbuf())); task::spawn(proc() { // TLS shouldn't carry over. @@ -294,7 +294,7 @@ mod tests { #[test] fn test_tls_overwrite() { - static my_key: Key<StrBuf> = &Key; + static my_key: Key<String> = &Key; my_key.replace(Some("first data".to_strbuf())); my_key.replace(Some("next data".to_strbuf())); // Shouldn't leak. assert!(my_key.get().unwrap().as_slice() == "next data"); @@ -302,7 +302,7 @@ mod tests { #[test] fn test_tls_pop() { - static my_key: Key<StrBuf> = &Key; + static my_key: Key<String> = &Key; my_key.replace(Some("weasel".to_strbuf())); assert!(my_key.replace(None).unwrap() == "weasel".to_strbuf()); // Pop must remove the data from the map. @@ -317,7 +317,7 @@ mod tests { // to get recorded as something within a rust stack segment. Then a // subsequent upcall (esp. for logging, think vsnprintf) would run on // a stack smaller than 1 MB. - static my_key: Key<StrBuf> = &Key; + static my_key: Key<String> = &Key; task::spawn(proc() { my_key.replace(Some("hax".to_strbuf())); }); @@ -325,7 +325,7 @@ mod tests { #[test] fn test_tls_multiple_types() { - static str_key: Key<StrBuf> = &Key; + static str_key: Key<String> = &Key; static box_key: Key<@()> = &Key; static int_key: Key<int> = &Key; task::spawn(proc() { @@ -337,7 +337,7 @@ mod tests { #[test] fn test_tls_overwrite_multiple_types() { - static str_key: Key<StrBuf> = &Key; + static str_key: Key<String> = &Key; static box_key: Key<@()> = &Key; static int_key: Key<int> = &Key; task::spawn(proc() { @@ -356,7 +356,7 @@ mod tests { #[test] #[should_fail] fn test_tls_cleanup_on_failure() { - static str_key: Key<StrBuf> = &Key; + static str_key: Key<String> = &Key; static box_key: Key<@()> = &Key; static int_key: Key<int> = &Key; str_key.replace(Some("parent data".to_strbuf())); |