azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Harden charset-as-string taking function deprecations.

Browse Source 
Fix usages in compiler.
This commit is contained in:
Ilya Gorbunov
2016-01-19 20:54:29 +03:00
parent 6d5a65cac6
commit c1ad82ff8c
9 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/collections/ArraysJVM.kt
+2 -2
View File
@@ -9,8 +9,8 @@ import java.nio.charset.Charset
/**
* Converts the contents of this byte array to a string using the specified [charset].
*/
@Deprecated("Use ByteArray.toString(Charset) instead.", ReplaceWith("this.toString(charset(charset))"))
public fun ByteArray.toString(charset: String): String = String(this, charset)
@Deprecated("Use ByteArray.toString(Charset) instead.", ReplaceWith("this.toString(charset(charset))"), level = DeprecationLevel.ERROR)
public fun ByteArray.toString(charset: String): String = String(this, charset(charset))
/**
* Converts the contents of this byte array to a string using the specified [charset].
libraries/stdlib/src/kotlin/io/FileReadWrite.kt
+8 -8
View File
@@ -69,8 +69,8 @@ public fun File.appendBytes(array: ByteArray): Unit = FileOutputStream(this, tru
* @param charset character set to use.
* @return the entire content of this file as a String.
*/
@Deprecated("Use File.readText(Charset) instead.", ReplaceWith("this.readText(charset(charset))"))
public fun File.readText(charset: String): String = readBytes().toString(charset)
@Deprecated("Use File.readText(Charset) instead.", ReplaceWith("this.readText(charset(charset))"), level = DeprecationLevel.ERROR)
public fun File.readText(charset: String): String = readBytes().toString(charset(charset))
/**
* Gets the entire content of this file as a String using UTF-8 or specified [charset].
@@ -89,8 +89,8 @@ public fun File.readText(charset: Charset = Charsets.UTF_8): String = readBytes(
* @param text text to write into file.
* @param charset character set to use.
*/
@Deprecated("Use File.writeText(String, Charset) instead.", ReplaceWith("this.writeText(text, charset(charset))"))
public fun File.writeText(text: String, charset: String): Unit = writeBytes(text.toByteArray(charset))
@Deprecated("Use File.writeText(String, Charset) instead.", ReplaceWith("this.writeText(text, charset(charset))"), level = DeprecationLevel.ERROR)
public fun File.writeText(text: String, charset: String): Unit = writeBytes(text.toByteArray(charset(charset)))
/**
* Sets the content of this file as [text] encoded using UTF-8 or specified [charset].
@@ -115,8 +115,8 @@ public fun File.appendText(text: String, charset: Charset = Charsets.UTF_8): Uni
* @param text text to append to file.
* @param charset character set to use.
*/
@Deprecated("Use File.appendText(String, Charset) instead.", ReplaceWith("this.appendText(text, charset(charset))"))
public fun File.appendText(text: String, charset: String): Unit = appendBytes(text.toByteArray(charset))
@Deprecated("Use File.appendText(String, Charset) instead.", ReplaceWith("this.appendText(text, charset(charset))"), level = DeprecationLevel.ERROR)
public fun File.appendText(text: String, charset: String): Unit = appendBytes(text.toByteArray(charset(charset)))
/**
* Reads file by byte blocks and calls [action] for each block read.
@@ -178,7 +178,7 @@ public fun File.forEachLine(charset: Charset = Charsets.UTF_8, action: (line: St
* @param charset character set to use.
* @param operation function to process file lines.
*/
@Deprecated("Use File.forEachLine(Charset, operation) instead.", ReplaceWith("this.forEachLine(charset(charset), operation)"))
@Deprecated("Use File.forEachLine(Charset, operation) instead.", ReplaceWith("this.forEachLine(charset(charset), operation)"), level = DeprecationLevel.ERROR)
public fun File.forEachLine(charset: String, operation: (line: String) -> Unit): Unit = forEachLine(Charset.forName(charset), operation)
/**
@@ -189,7 +189,7 @@ public fun File.forEachLine(charset: String, operation: (line: String) -> Unit):
* @param charset character set to use.
* @return list of file lines.
*/
@Deprecated("Use File.readLines(Charset) instead.", ReplaceWith("this.readLines(charset(charset))"))
@Deprecated("Use File.readLines(Charset) instead.", ReplaceWith("this.readLines(charset(charset))"), level = DeprecationLevel.ERROR)
public fun File.readLines(charset: String): List<String> = readLines(Charset.forName(charset))
/**
libraries/stdlib/src/kotlin/io/IOStreams.kt
+6 -6
View File
@@ -69,12 +69,12 @@ public fun InputStream.reader(charset: Charset = Charsets.UTF_8): InputStreamRea
public fun InputStream.bufferedReader(charset: Charset = Charsets.UTF_8): BufferedReader = reader(charset).buffered()
/** Creates a reader on this input stream using the specified [charset]. */
@Deprecated("Use InputStream.reader(Charset) instead.", ReplaceWith("this.reader(charset(charset))"))
@Deprecated("Use InputStream.reader(Charset) instead.", ReplaceWith("this.reader(charset(charset))"), level = DeprecationLevel.ERROR)
public fun InputStream.reader(charset: String): InputStreamReader = InputStreamReader(this, charset)
/** Creates a buffered reader on this input stream using the specified [charset]. */
@Deprecated("Use InputStream.bufferedReader(Charset) instead.", ReplaceWith("this.bufferedReader(charset(charset))"))
public fun InputStream.bufferedReader(charset: String): BufferedReader = reader(charset).buffered()
@Deprecated("Use InputStream.bufferedReader(Charset) instead.", ReplaceWith("this.bufferedReader(charset(charset))"), level = DeprecationLevel.ERROR)
public fun InputStream.bufferedReader(charset: String): BufferedReader = reader(charset(charset)).buffered()
/**
* Creates a buffered output stream wrapping this stream.
@@ -90,12 +90,12 @@ public fun OutputStream.writer(charset: Charset = Charsets.UTF_8): OutputStreamW
public fun OutputStream.bufferedWriter(charset: Charset = Charsets.UTF_8): BufferedWriter = writer(charset).buffered()
/** Creates a writer on this output stream using the specified [charset]. */
@Deprecated("Use OutputStream.writer(Charset) instead.", ReplaceWith("this.writer(charset(charset))"))
@Deprecated("Use OutputStream.writer(Charset) instead.", ReplaceWith("this.writer(charset(charset))"), level = DeprecationLevel.ERROR)
public fun OutputStream.writer(charset: String): OutputStreamWriter = OutputStreamWriter(this, charset)
/** Creates a buffered writer on this output stream using the specified [charset]. */
@Deprecated("Use OutputStream.bufferedWriter(Charset) instead.", ReplaceWith("this.bufferedWriter(charset(charset))"))
public fun OutputStream.bufferedWriter(charset: String): BufferedWriter = writer(charset).buffered()
@Deprecated("Use OutputStream.bufferedWriter(Charset) instead.", ReplaceWith("this.bufferedWriter(charset(charset))"), level = DeprecationLevel.ERROR)
public fun OutputStream.bufferedWriter(charset: String): BufferedWriter = writer(charset(charset)).buffered()
/**
* Copies this stream to the given output stream, returning the number of bytes copied
libraries/stdlib/src/kotlin/io/ReadWrite.kt
+2 -2
View File
@@ -127,8 +127,8 @@ public fun Reader.copyTo(out: Writer, bufferSize: Int = DEFAULT_BUFFER_SIZE): Lo
* @param charset a character set to use.
* @return a string with this URL entire content.
*/
@Deprecated("Use URL.readText(Charset) instead.", ReplaceWith("this.readText(charset(charset))"))
public fun URL.readText(charset: String): String = readBytes().toString(charset)
@Deprecated("Use URL.readText(Charset) instead.", ReplaceWith("this.readText(charset(charset))"), level = DeprecationLevel.ERROR)
public fun URL.readText(charset: String): String = readBytes().toString(charset(charset))
/**
* Reads the entire content of this URL as a String using UTF-8 or the specified [charset].
libraries/stdlib/src/kotlin/text/StringsJVM.kt
+3 -3
View File
@@ -181,7 +181,7 @@ public fun String.endsWith(suffix: String, ignoreCase: Boolean = false): Boolean
* @param length the number of bytes to be converted.
* @param charsetName the name of the character set to use.
*/
@Deprecated("Use String(bytes, offset, length, Charset) instead.", ReplaceWith("String(bytes, offset, length, charset(charsetName))"))
@Deprecated("Use String(bytes, offset, length, Charset) instead.", ReplaceWith("String(bytes, offset, length, charset(charsetName))"), level = DeprecationLevel.ERROR)
public fun String(bytes: ByteArray, offset: Int, length: Int, charsetName: String): String = java.lang.String(bytes, offset, length, charsetName) as String
/**
@@ -199,7 +199,7 @@ public fun String(bytes: ByteArray, offset: Int, length: Int, charset: Charset):
* Converts the data from the specified array of bytes to characters using the specified character set
* and returns the conversion result as a string.
*/
@Deprecated("Use String(bytes, Charset) instead.", ReplaceWith("String(bytes, charset(charsetName))"))
@Deprecated("Use String(bytes, Charset) instead.", ReplaceWith("String(bytes, charset(charsetName))"), level = DeprecationLevel.ERROR)
public fun String(bytes: ByteArray, charsetName: String): String = java.lang.String(bytes, charsetName) as String
/**
@@ -412,7 +412,7 @@ public operator fun CharSequence.get(start: Int, end: Int): CharSequence = subSe
/**
* Encodes the contents of this string using the specified character set and returns the resulting byte array.
*/
@Deprecated("Use String.toByteArray(Charset) instead.", ReplaceWith("this.toByteArray(charset(charset))"))
@Deprecated("Use String.toByteArray(Charset) instead.", ReplaceWith("this.toByteArray(charset(charset))"), level = DeprecationLevel.ERROR)
public fun String.toByteArray(charset: String): ByteArray = (this as java.lang.String).getBytes(charset)
/**