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

sandwwraith · sandwwraith · commit 8c93430a72f8 · 2021-12-23T17:43:07.000+03:00
diff --git a/formats/json/commonMain/src/kotlinx/serialization/json/Json.kt b/formats/json/commonMain/src/kotlinx/serialization/json/Json.kt
@@ -44,7 +44,7 @@ import kotlin.native.concurrent.*
  * val deserializedFromTree: DataHolder = json.decodeFromJsonElement<DataHolder>(jsonTree)
  *
  *  // Deserialize from string to JSON tree, JSON-specific
- *  val deserializedToTree: JsonElement = json.parseJsonElement(stringOutput)
+ *  val deserializedToTree: JsonElement = json.parseToJsonElement(stringOutput)
  * ```
  *
  * Json instance also exposes its [configuration] that can be used in custom serializers

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ import kotlin.native.concurrent.*`
`44`	`44`	`* val deserializedFromTree: DataHolder = json.decodeFromJsonElement<DataHolder>(jsonTree)`
`45`	`45`	`*`
`46`	`46`	`* // Deserialize from string to JSON tree, JSON-specific`
`47`		`- * val deserializedToTree: JsonElement = json.parseJsonElement(stringOutput)`
	`47`	`+ * val deserializedToTree: JsonElement = json.parseToJsonElement(stringOutput)`
`48`	`48`	* ```
`49`	`49`	`*`
`50`	`50`	`* Json instance also exposes its [configuration] that can be used in custom serializers`