From 91cbb963020ac2aead68ff2bbd7e9077d5558abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 25 Jul 2021 13:34:00 +0200 Subject: [PATCH] Bump all long-living deprecations to ERRORs --- helpers/content.go | 2 +- hugolib/config.go | 2 +- .../page_generate/generate_page_wrappers.go | 2 +- resources/page/page_wrappers.autogen.go | 32 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/helpers/content.go b/helpers/content.go index 5e56ad6b..161b14e7 100644 --- a/helpers/content.go +++ b/helpers/content.go @@ -214,7 +214,7 @@ func (c *ContentSpec) ResolveMarkup(in string) string { return "html" default: if in == "mmark" { - Deprecated("Markup type mmark", "See https://gohugo.io//content-management/formats/#list-of-content-formats", false) + Deprecated("Markup type mmark", "See https://gohugo.io//content-management/formats/#list-of-content-formats", true) } if conv := c.Converters.Get(in); conv != nil { return conv.Name() diff --git a/hugolib/config.go b/hugolib/config.go index 694f3461..96114fad 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -109,7 +109,7 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid // We made this a Glob pattern in Hugo 0.75, we don't need both. if l.cfg.GetBool("ignoreVendor") { - helpers.Deprecated("--ignoreVendor", "--ignoreVendorPaths **", false) + helpers.Deprecated("--ignoreVendor", "--ignoreVendorPaths **", true) l.cfg.Set("ignoreVendorPaths", "**") } diff --git a/resources/page/page_generate/generate_page_wrappers.go b/resources/page/page_generate/generate_page_wrappers.go index 17346ec1..39ea40d1 100644 --- a/resources/page/page_generate/generate_page_wrappers.go +++ b/resources/page/page_generate/generate_page_wrappers.go @@ -163,7 +163,7 @@ func generateDeprecatedWrappers(c *codegen.Inspector) error { } } - return fmt.Sprintf("helpers.Deprecated(%q, %q, false)", "Page."+name, alternative) + return fmt.Sprintf("helpers.Deprecated(%q, %q, true)", "Page."+name, alternative) } var buff bytes.Buffer diff --git a/resources/page/page_wrappers.autogen.go b/resources/page/page_wrappers.autogen.go index 53f0c09d..2bdd5112 100644 --- a/resources/page/page_wrappers.autogen.go +++ b/resources/page/page_wrappers.autogen.go @@ -32,66 +32,66 @@ type pageDeprecated struct { } func (p *pageDeprecated) Filename() string { - helpers.Deprecated("Page.Filename", "Use .File.Filename", false) + helpers.Deprecated("Page.Filename", "Use .File.Filename", true) return p.p.Filename() } func (p *pageDeprecated) Dir() string { - helpers.Deprecated("Page.Dir", "Use .File.Dir", false) + helpers.Deprecated("Page.Dir", "Use .File.Dir", true) return p.p.Dir() } func (p *pageDeprecated) IsDraft() bool { - helpers.Deprecated("Page.IsDraft", "Use .Draft.", false) + helpers.Deprecated("Page.IsDraft", "Use .Draft.", true) return p.p.IsDraft() } func (p *pageDeprecated) Extension() string { - helpers.Deprecated("Page.Extension", "Use .File.Extension", false) + helpers.Deprecated("Page.Extension", "Use .File.Extension", true) return p.p.Extension() } func (p *pageDeprecated) Hugo() hugo.Info { - helpers.Deprecated("Page.Hugo", "Use the global hugo function.", false) + helpers.Deprecated("Page.Hugo", "Use the global hugo function.", true) return p.p.Hugo() } func (p *pageDeprecated) Ext() string { - helpers.Deprecated("Page.Ext", "Use .File.Ext", false) + helpers.Deprecated("Page.Ext", "Use .File.Ext", true) return p.p.Ext() } func (p *pageDeprecated) LanguagePrefix() string { - helpers.Deprecated("Page.LanguagePrefix", "Use .Site.LanguagePrefix.", false) + helpers.Deprecated("Page.LanguagePrefix", "Use .Site.LanguagePrefix.", true) return p.p.LanguagePrefix() } func (p *pageDeprecated) GetParam(arg0 string) interface{} { - helpers.Deprecated("Page.GetParam", "Use .Param or .Params.myParam.", false) + helpers.Deprecated("Page.GetParam", "Use .Param or .Params.myParam.", true) return p.p.GetParam(arg0) } func (p *pageDeprecated) LogicalName() string { - helpers.Deprecated("Page.LogicalName", "Use .File.LogicalName", false) + helpers.Deprecated("Page.LogicalName", "Use .File.LogicalName", true) return p.p.LogicalName() } func (p *pageDeprecated) BaseFileName() string { - helpers.Deprecated("Page.BaseFileName", "Use .File.BaseFileName", false) + helpers.Deprecated("Page.BaseFileName", "Use .File.BaseFileName", true) return p.p.BaseFileName() } func (p *pageDeprecated) RSSLink() template.URL { - helpers.Deprecated("Page.RSSLink", "Use the Output Format's link, e.g. something like:\n {{ with .OutputFormats.Get \"RSS\" }}{{ .RelPermalink }}{{ end }}", false) + helpers.Deprecated("Page.RSSLink", "Use the Output Format's link, e.g. something like:\n {{ with .OutputFormats.Get \"RSS\" }}{{ .RelPermalink }}{{ end }}", true) return p.p.RSSLink() } func (p *pageDeprecated) TranslationBaseName() string { - helpers.Deprecated("Page.TranslationBaseName", "Use .File.TranslationBaseName", false) + helpers.Deprecated("Page.TranslationBaseName", "Use .File.TranslationBaseName", true) return p.p.TranslationBaseName() } func (p *pageDeprecated) URL() string { - helpers.Deprecated("Page.URL", "Use .Permalink or .RelPermalink. If what you want is the front matter URL value, use .Params.url", false) + helpers.Deprecated("Page.URL", "Use .Permalink or .RelPermalink. If what you want is the front matter URL value, use .Params.url", true) return p.p.URL() } func (p *pageDeprecated) ContentBaseName() string { - helpers.Deprecated("Page.ContentBaseName", "Use .File.ContentBaseName", false) + helpers.Deprecated("Page.ContentBaseName", "Use .File.ContentBaseName", true) return p.p.ContentBaseName() } func (p *pageDeprecated) UniqueID() string { - helpers.Deprecated("Page.UniqueID", "Use .File.UniqueID", false) + helpers.Deprecated("Page.UniqueID", "Use .File.UniqueID", true) return p.p.UniqueID() } func (p *pageDeprecated) FileInfo() hugofs.FileMetaInfo { - helpers.Deprecated("Page.FileInfo", "Use .File.FileInfo", false) + helpers.Deprecated("Page.FileInfo", "Use .File.FileInfo", true) return p.p.FileInfo() }