diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-11-25 20:04:49 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-11-25 20:14:20 +0100 |
commit | 33d733300a4f0b765234706e51bb7e077fdc2471 (patch) | |
tree | a89cfea59a0d115c9d2368a7a68dde96353cd3e0 /resources/page | |
parent | e3451371bdb68015f89c8c0f7d8ea0a19fff8df5 (diff) |
Deprecate mmark
Fixes #6486
Diffstat (limited to 'resources/page')
-rw-r--r-- | resources/page/page_generate/generate_page_wrappers.go | 2 | ||||
-rw-r--r-- | resources/page/page_marshaljson.autogen.go | 3 | ||||
-rw-r--r-- | resources/page/page_wrappers.autogen.go | 32 |
3 files changed, 19 insertions, 18 deletions
diff --git a/resources/page/page_generate/generate_page_wrappers.go b/resources/page/page_generate/generate_page_wrappers.go index 6d421c356..4c63962fa 100644 --- a/resources/page/page_generate/generate_page_wrappers.go +++ b/resources/page/page_generate/generate_page_wrappers.go @@ -165,7 +165,7 @@ func generateDeprecatedWrappers(c *codegen.Inspector) error { } } - return fmt.Sprintf("helpers.Deprecated(%q, %q, %q, false)", "Page", "."+name, alternative) + return fmt.Sprintf("helpers.Deprecated(%q, %q, false)", "Page."+name, alternative) } var buff bytes.Buffer diff --git a/resources/page/page_marshaljson.autogen.go b/resources/page/page_marshaljson.autogen.go index b2a8ef79f..6e08210ac 100644 --- a/resources/page/page_marshaljson.autogen.go +++ b/resources/page/page_marshaljson.autogen.go @@ -18,6 +18,7 @@ package page import ( "encoding/json" "github.com/bep/gitmap" + "github.com/gohugoio/hugo/common/maps" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/langs" "github.com/gohugoio/hugo/media" @@ -104,7 +105,7 @@ func MarshalPageToJSON(p Page) ([]byte, error) { RelPermalink string Name string Title string - Params map[string]interface{} + Params maps.Params Data interface{} Date time.Time Lastmod time.Time diff --git a/resources/page/page_wrappers.autogen.go b/resources/page/page_wrappers.autogen.go index d2d14dee6..bc2cf968c 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", false) return p.p.Filename() } func (p *pageDeprecated) Dir() string { - helpers.Deprecated("Page", ".Dir", "Use .File.Dir", false) + helpers.Deprecated("Page.Dir", "Use .File.Dir", false) return p.p.Dir() } func (p *pageDeprecated) IsDraft() bool { - helpers.Deprecated("Page", ".IsDraft", "Use .Draft.", false) + helpers.Deprecated("Page.IsDraft", "Use .Draft.", false) return p.p.IsDraft() } func (p *pageDeprecated) Extension() string { - helpers.Deprecated("Page", ".Extension", "Use .File.Extension", false) + helpers.Deprecated("Page.Extension", "Use .File.Extension", false) 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.", false) return p.p.Hugo() } func (p *pageDeprecated) Ext() string { - helpers.Deprecated("Page", ".Ext", "Use .File.Ext", false) + helpers.Deprecated("Page.Ext", "Use .File.Ext", false) return p.p.Ext() } func (p *pageDeprecated) LanguagePrefix() string { - helpers.Deprecated("Page", ".LanguagePrefix", "Use .Site.LanguagePrefix.", false) + helpers.Deprecated("Page.LanguagePrefix", "Use .Site.LanguagePrefix.", false) 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.", false) 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", false) return p.p.LogicalName() } func (p *pageDeprecated) BaseFileName() string { - helpers.Deprecated("Page", ".BaseFileName", "Use .File.BaseFileName", false) + helpers.Deprecated("Page.BaseFileName", "Use .File.BaseFileName", false) 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 }}", false) return p.p.RSSLink() } func (p *pageDeprecated) TranslationBaseName() string { - helpers.Deprecated("Page", ".TranslationBaseName", "Use .File.TranslationBaseName", false) + helpers.Deprecated("Page.TranslationBaseName", "Use .File.TranslationBaseName", false) 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", false) return p.p.URL() } func (p *pageDeprecated) ContentBaseName() string { - helpers.Deprecated("Page", ".ContentBaseName", "Use .File.ContentBaseName", false) + helpers.Deprecated("Page.ContentBaseName", "Use .File.ContentBaseName", false) return p.p.ContentBaseName() } func (p *pageDeprecated) UniqueID() string { - helpers.Deprecated("Page", ".UniqueID", "Use .File.UniqueID", false) + helpers.Deprecated("Page.UniqueID", "Use .File.UniqueID", false) 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", false) return p.p.FileInfo() } |