wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 22:33:57 +02:00
Code Activity

Merge pull request #13406 from xokdvium/libflake-dead-code

Browse source 
libflake: Remove unused maybeParseFlakeRef and maybeParseFlakeRefWith…
This commit is contained in:
Eelco Dolstra 2025-07-01 17:03:00 +02:00 • committed by GitHub
commit 4458a9061b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/libflake/flakeref.cc
View file

@ -57,18 +57,6 @@ FlakeRef parseFlakeRef(
return flakeRef; return flakeRef;
} }
std::optional<FlakeRef> maybeParseFlakeRef(
const fetchers::Settings & fetchSettings,
const std::string & url,
const std::optional<Path> & baseDir)
{
try {
return parseFlakeRef(fetchSettings, url, baseDir);
} catch (Error &) {
return {};
}
}
static std::pair<FlakeRef, std::string> fromParsedURL( static std::pair<FlakeRef, std::string> fromParsedURL(
const fetchers::Settings & fetchSettings, const fetchers::Settings & fetchSettings,
ParsedURL && parsedURL, ParsedURL && parsedURL,
@ -261,17 +249,6 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment(
} }
} }
std::optional<std::pair<FlakeRef, std::string>> maybeParseFlakeRefWithFragment(
const fetchers::Settings & fetchSettings,
const std::string & url, const std::optional<Path> & baseDir)
{
try {
return parseFlakeRefWithFragment(fetchSettings, url, baseDir);
} catch (Error & e) {
return {};
}
}
FlakeRef FlakeRef::fromAttrs( FlakeRef FlakeRef::fromAttrs(
const fetchers::Settings & fetchSettings, const fetchers::Settings & fetchSettings,
const fetchers::Attrs & attrs) const fetchers::Attrs & attrs)

16
src/libflake/include/nix/flake/flakeref.hh
View file

@ -93,14 +93,6 @@ FlakeRef parseFlakeRef(
bool isFlake = true, bool isFlake = true,
bool preserveRelativePaths = false); bool preserveRelativePaths = false);
/**
* @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory)
*/
std::optional<FlakeRef> maybeParseFlake(
const fetchers::Settings & fetchSettings,
const std::string & url,
const std::optional<Path> & baseDir = {});
/** /**
* @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) * @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory)
*/ */
@ -112,14 +104,6 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment(
bool isFlake = true, bool isFlake = true,
bool preserveRelativePaths = false); bool preserveRelativePaths = false);
/**
* @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory)
*/
std::optional<std::pair<FlakeRef, std::string>> maybeParseFlakeRefWithFragment(
const fetchers::Settings & fetchSettings,
const std::string & url,
const std::optional<Path> & baseDir = {});
/** /**
* @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) * @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory)
*/ */