Unverified Commit f370c02b authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #261418 from tweag/fileset/better-coerce-error 

lib.fileset: Improved error for unsupported coercion values
parents cdec7973 7247ec07

lib/fileset/internal.nix

+2 −2
Original line number Diff line number Diff line
@@ -172,11 +172,11 @@ rec { 
    else if ! isPath value then

      if isStringLike value then

        throw ''

          ${context} ("${toString value}") is a string-like value, but it should be a path instead.

          ${context} ("${toString value}") is a string-like value, but it should be a file set or a path instead.

              Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.''

      else

        throw ''

          ${context} is of type ${typeOf value}, but it should be a path instead.''

          ${context} is of type ${typeOf value}, but it should be a file set or a path instead.''

    else if ! pathExists value then

      throw ''

        ${context} (${toString value}) does not exist.''

lib/fileset/tests.sh

+2 −2
Original line number Diff line number Diff line
@@ -355,8 +355,8 @@ expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: ` 
rm -rf *



# Path coercion only works for paths

expectFailure 'toSource { root = ./.; fileset = 10; }' 'lib.fileset.toSource: `fileset` is of type int, but it should be a path instead.'

expectFailure 'toSource { root = ./.; fileset = "/some/path"; }' 'lib.fileset.toSource: `fileset` \("/some/path"\) is a string-like value, but it should be a path instead.

expectFailure 'toSource { root = ./.; fileset = 10; }' 'lib.fileset.toSource: `fileset` is of type int, but it should be a file set or a path instead.'

expectFailure 'toSource { root = ./.; fileset = "/some/path"; }' 'lib.fileset.toSource: `fileset` \("/some/path"\) is a string-like value, but it should be a file set or a path instead.

\s*Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'



# Path coercion errors for non-existent paths