Unverified Commit fcdca53f authored by h7x4's avatar h7x4 Committed by GitHub
Browse files

Merge pull request #329441 from eclairevoyant/hocon-typo-fix 

formats.hocon: fix typo
parents 4c948891 2d71c788

pkgs/pkgs-lib/formats/hocon/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -70,10 +70,10 @@ in 
          }

        else

          assert lib.assertMsg (lib.isAttrs value) ''

            Value of invalid type provided to `hocon.lib.mkSubstition`: ${lib.typeOf value}

            Value of invalid type provided to `hocon.lib.mkSubstitution`: ${lib.typeOf value}

          '';

          assert lib.assertMsg (value ? "value") ''

            Argument to `hocon.lib.mkSubstition` is missing a `value`:

            Argument to `hocon.lib.mkSubstitution` is missing a `value`:

            ${builtins.toJSON value}

          '';

          {

pkgs/pkgs-lib/formats/hocon/src/src/main.rs

+2 −2
Original line number Diff line number Diff line
@@ -77,12 +77,12 @@ fn parse_special_types(o: &Map<String, Value>) -> Option<HOCONValue> { 
                    .get("value")

                    .expect("Missing value for substitution")

                    .as_str()

                    .unwrap_or_else(|| panic!("Substition value is not a string: {:?}", o));

                    .unwrap_or_else(|| panic!("Substitution value is not a string: {:?}", o));

                let required = o

                    .get("required")

                    .unwrap_or(&Value::Bool(false))

                    .as_bool()

                    .unwrap_or_else(|| panic!("Substition value is not a string: {:?}", o));

                    .unwrap_or_else(|| panic!("Substitution value is not a string: {:?}", o));



                debug_assert!(!value.contains('}'));