Merge remote-tracking branch 'origin/master' into dev

sandwwraith · sandwwraith · commit 779acb29b35b · 2021-09-06T15:00:48.000+03:00
diff --git a/core/commonMain/src/kotlinx/serialization/SerialFormat.kt b/core/commonMain/src/kotlinx/serialization/SerialFormat.kt
@@ -24,7 +24,7 @@ import kotlinx.serialization.modules.*
  * `SerialFormat` interface is not stable for inheritance in 3rd party libraries, as new methods
  * might be added to this interface or contracts of the existing methods can be changed.
  *
- * It is safe to operate with instances of `BinaryFormat` and call its methods.
+ * It is safe to operate with instances of `SerialFormat` and call its methods.
  */
 @ExperimentalSerializationApi
 public interface SerialFormat {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import kotlinx.serialization.modules.*`
`24`	`24`	* `SerialFormat` interface is not stable for inheritance in 3rd party libraries, as new methods
`25`	`25`	`* might be added to this interface or contracts of the existing methods can be changed.`
`26`	`26`	`*`
`27`		- * It is safe to operate with instances of `BinaryFormat` and call its methods.
	`27`	+ * It is safe to operate with instances of `SerialFormat` and call its methods.
`28`	`28`	`*/`
`29`	`29`	`@ExperimentalSerializationApi`
`30`	`30`	`public interface SerialFormat {`