[pull] master from SchemaStore:master

CONTRIBUTING.md

@@ -25,7 +25,7 @@
 - [Compatible Language Servers and Tools](#compatible-language-servers-and-tools)
   - [`redhat-developer/yaml-language-server`](#redhat-developeryaml-language-server)
   - [`tamasfe/taplo`](#tamasfetaplo)
-  - [`tombi-toml/tombi](#tombi-toml-tombi)
+  - [`tombi-toml/tombi`](#tombi-toml-tombi)
   - [`Microsoft/vscode-json-languageservice`](#microsoftvscode-json-languageservice)
   - [Other](#other)
 - [Troubleshooting](#troubleshooting)

src/negative_test/pep-723/3.toml

@@ -1,3 +1,3 @@
 #:schema ../../schemas/json/pep-723.json
-[tool.pyright]
+[pyright]
 strict = 42

src/schema-validation.jsonc

@@ -277,7 +277,8 @@
     "metaschema-draft-07-unofficial-strict.json",
     "glazewm.json",
     "youtrack-app.json",
-    "cinnamon-spice-settings.json"
+    "cinnamon-spice-settings.json",
+    "pnpm-workspace.json"
   ],
   "fileMatchConflict": [
     // Name conflicts must be avoided. Do not add additional items here

src/schemas/json/cargo.json

@@ -846,23 +846,64 @@
         }
       ]
     },
+    "SplitDebuginfo": {
+      "title": "SplitDebuginfo",
+      "description": "The split-debuginfo setting controls the -C split-debuginfo flag which controls whether debug information, if generated, is either placed in the executable itself or adjacent to it. This can be useful for reducing the size of the executable, but may make it harder to debug the executable.",
+      "oneOf": [
+        {
+          "type": "string",
+          "enum": ["off"],
+          "description": "This is the default for platforms with ELF binaries and windows-gnu (not Windows MSVC and not macOS). This typically means that DWARF debug information can be found in the final artifact in sections of the executable. This option is not supported on Windows MSVC. On macOS this options prevents the final execution of dsymutil to generate debuginfo."
+        },
+        {
+          "type": "string",
+          "enum": ["packed"],
+          "description": "This is the default for Windows MSVC and macOS. The term \"packed\" here means that all the debug information is packed into a separate file from the main executable. On Windows MSVC this is a *.pdb file, on macOS this is a *.dSYM folder, and on other platforms this is a *.dwp file."
+        },
+        {
+          "type": "string",
+          "enum": ["unpacked"],
+          "description": "This means that debug information will be found in separate files for each compilation unit (object file). This is not supported on Windows MSVC. On macOS this means the original object files will contain debug information. On other Unix platforms this means that *.dwo files will contain debug information."
+        }
+      ]
+    },
     "Profile": {
       "title": "Profile",
       "type": "object",
       "properties": {
-        "codegen-units": {
-          "description": "The `codegen-units` setting controls the [`-C codegen-units` flag](https://doc.rust-lang.org/rustc/codegen-options/index.html#codegen-units) which\ncontrols how many \"code generation units\" a crate will be split into. More\ncode generation units allows more of a crate to be processed in parallel\npossibly reducing compile time, but may produce slower code.\n\nThis option takes an integer greater than 0.\n\nThe default is 256 for [incremental](https://doc.rust-lang.org/cargo/reference/profiles.html#incremental) builds, and 16 for\nnon-incremental builds.",
-          "type": "integer",
-          "format": "uint32",
-          "minimum": 0,
+        "opt-level": {
+          "$ref": "#/definitions/OptLevel"
+        },
+        "debug": {
+          "$ref": "#/definitions/DebugLevel"
+        },
+        "split-debuginfo": {
+          "$ref": "#/definitions/SplitDebuginfo",
           "x-taplo": {
             "links": {
-              "key": "https://doc.rust-lang.org/cargo/reference/profiles.html#codegen-units"
+              "key": "https://doc.rust-lang.org/cargo/reference/profiles.html#split-debuginfo"
             }
           }
         },
-        "debug": {
-          "$ref": "#/definitions/DebugLevel"
+        "strip": {
+          "description": "The strip option controls the -C strip flag, which directs rustc to strip either symbols or debuginfo from a binary.",
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": ["none", "debuginfo", "symbols"],
+              "default": "none"
+            },
+            {
+              "type": "boolean",
+              "enum": [true],
+              "description": "Equivalent to \"symbols\"."
+            },
+            {
+              "type": "boolean",
+              "enum": [false],
+              "description": "Equivalent to \"none\"."
+            }
+          ]
         },
         "debug-assertions": {
           "description": "The `debug-assertions` setting controls the [`-C debug-assertions` flag](https://doc.rust-lang.org/rustc/codegen-options/index.html#debug-assertions) which\nturns `cfg(debug_assertions)` [conditional compilation](https://doc.rust-lang.org/reference/conditional-compilation.html#debug_assertions) on or off. Debug\nassertions are intended to include runtime validation which is only available\nin debug/development builds. These may be things that are too expensive or\notherwise undesirable in a release build. Debug assertions enables the\n[`debug_assert!` macro](https://doc.rust-lang.org/std/macro.debug_assert.html) in the standard library.",
@@ -873,12 +914,21 @@
             }
           }
         },
-        "dir-name": {
-          "type": "string",
+        "overflow-checks": {
+          "description": "The `overflow-checks` setting controls the [`-C overflow-checks` flag](https://doc.rust-lang.org/rustc/codegen-options/index.html#overflow-checks) which\ncontrols the behavior of [runtime integer overflow](https://doc.rust-lang.org/reference/expressions/operator-expr.html#overflow). When overflow-checks are\nenabled, a panic will occur on overflow.",
+          "type": "boolean",
           "x-taplo": {
-            "hidden": true
+            "links": {
+              "key": "https://doc.rust-lang.org/cargo/reference/profiles.html#overflow-checks"
+            }
           }
         },
+        "lto": {
+          "$ref": "#/definitions/Lto"
+        },
+        "panic": {
+          "$ref": "#/definitions/Panic"
+        },
         "incremental": {
           "description": "The `incremental` setting controls the [`-C incremental` flag](https://doc.rust-lang.org/rustc/codegen-options/index.html#incremental) which controls\nwhether or not incremental compilation is enabled. Incremental compilation\ncauses `rustc` to to save additional information to disk which will be reused\nwhen recompiling the crate, improving re-compile times. The additional\ninformation is stored in the `target` directory.\n\nThe valid options are:\n\n* `true`: enabled\n* `false`: disabled\n\nIncremental compilation is only used for workspace members and \"path\"\ndependencies.\n\nThe incremental value can be overridden globally with the `CARGO_INCREMENTAL`\n[environment variable](https://doc.rust-lang.org/cargo/reference/environment-variables.html) or the [`build.incremental`](https://doc.rust-lang.org/cargo/reference/config.html#buildincremental) config variable.",
           "type": "boolean",
@@ -888,24 +938,23 @@
             }
           }
         },
-        "inherits": {
-          "type": "string",
+        "codegen-units": {
+          "description": "The `codegen-units` setting controls the [`-C codegen-units` flag](https://doc.rust-lang.org/rustc/codegen-options/index.html#codegen-units) which\ncontrols how many \"code generation units\" a crate will be split into. More\ncode generation units allows more of a crate to be processed in parallel\npossibly reducing compile time, but may produce slower code.\n\nThis option takes an integer greater than 0.\n\nThe default is 256 for [incremental](https://doc.rust-lang.org/cargo/reference/profiles.html#incremental) builds, and 16 for\nnon-incremental builds.",
+          "type": "integer",
+          "format": "uint32",
+          "minimum": 0,
           "x-taplo": {
-            "hidden": true
+            "links": {
+              "key": "https://doc.rust-lang.org/cargo/reference/profiles.html#codegen-units"
+            }
           }
         },
-        "lto": {
-          "$ref": "#/definitions/Lto"
-        },
-        "opt-level": {
-          "$ref": "#/definitions/OptLevel"
-        },
-        "overflow-checks": {
-          "description": "The `overflow-checks` setting controls the [`-C overflow-checks` flag](https://doc.rust-lang.org/rustc/codegen-options/index.html#overflow-checks) which\ncontrols the behavior of [runtime integer overflow](https://doc.rust-lang.org/reference/expressions/operator-expr.html#overflow). When overflow-checks are\nenabled, a panic will occur on overflow.",
+        "rpath": {
+          "description": "The `rpath` setting controls the [`-C rpath` flag](https://doc.rust-lang.org/rustc/codegen-options/index.html#rpath) which controls\nwhether or not [`rpath`](https://en.wikipedia.org/wiki/Rpath) is enabled.",
           "type": "boolean",
           "x-taplo": {
             "links": {
-              "key": "https://doc.rust-lang.org/cargo/reference/profiles.html#overflow-checks"
+              "key": "https://doc.rust-lang.org/cargo/reference/profiles.html#rpath"
             }
           }
         },
@@ -922,16 +971,16 @@
             }
           }
         },
-        "panic": {
-          "$ref": "#/definitions/Panic"
+        "dir-name": {
+          "type": "string",
+          "x-taplo": {
+            "hidden": true
+          }
         },
-        "rpath": {
-          "description": "The `rpath` setting controls the [`-C rpath` flag](https://doc.rust-lang.org/rustc/codegen-options/index.html#rpath) which controls\nwhether or not [`rpath`](https://en.wikipedia.org/wiki/Rpath) is enabled.",
-          "type": "boolean",
+        "inherits": {
+          "type": "string",
           "x-taplo": {
-            "links": {
-              "key": "https://doc.rust-lang.org/cargo/reference/profiles.html#rpath"
-            }
+            "hidden": true
           }
         }
       },

src/schemas/json/pep-723.json

@@ -49,76 +49,10 @@
       },
       "x-tombi-table-keys-order": "ascending",
       "properties": {
-        "black": {
-          "$ref": "https://json.schemastore.org/partial-black.json"
-        },
-        "cibuildwheel": {
-          "$ref": "https://json.schemastore.org/partial-cibuildwheel.json"
-        },
-        "mypy": {
-          "$ref": "https://json.schemastore.org/partial-mypy.json"
-        },
-        "ruff": {
-          "$ref": "https://json.schemastore.org/ruff.json"
-        },
-        "hatch": {
-          "$ref": "https://json.schemastore.org/hatch.json"
-        },
-        "maturin": {
-          "$ref": "https://json.schemastore.org/maturin.json",
-          "title": "Maturin",
-          "description": "Build and publish crates with pyo3, cffi and uniffi bindings as well as rust binaries as python packages"
-        },
-        "scikit-build": {
-          "$ref": "https://json.schemastore.org/partial-scikit-build.json"
-        },
-        "setuptools": {
-          "$ref": "https://json.schemastore.org/partial-setuptools.json"
-        },
-        "setuptools_scm": {
-          "$ref": "https://json.schemastore.org/partial-setuptools-scm.json"
-        },
-        "poe": {
-          "$ref": "https://json.schemastore.org/partial-poe.json"
-        },
-        "poetry": {
-          "$ref": "https://json.schemastore.org/partial-poetry.json"
-        },
-        "pdm": {
-          "$ref": "https://json.schemastore.org/partial-pdm.json"
-        },
-        "pyright": {
-          "$ref": "https://json.schemastore.org/partial-pyright.json"
-        },
-        "repo-review": {
-          "$ref": "https://json.schemastore.org/partial-repo-review.json"
-        },
-        "taskipy": {
-          "$ref": "https://json.schemastore.org/partial-taskipy.json",
-          "title": "Task Runner",
-          "description": "The complementary task runner for python."
-        },
-        "tombi": {
-          "$ref": "https://json.schemastore.org/tombi.json",
-          "title": "TOML Toolkit",
-          "description": "Tombi (鳶) is a toolkit for TOML; providing a formatter/linter and language server"
-        },
-        "tox": {
-          "$ref": "https://json.schemastore.org/partial-tox.json"
-        },
         "uv": {
           "$ref": "https://json.schemastore.org/uv.json"
         }
-      },
-      "examples": [
-        {
-          "tool": {
-            "isort": {
-              "profile": "black"
-            }
-          }
-        }
-      ]
+      }
     }
   }
 }