Commit22f6e41

authored

Montana/norly (#1194)

1 parent5b9847a commit22f6e41Copy full SHA for 22f6e41

File tree

-13

lines changed

-13

lines changed

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ impl Config {`
`66`	`66`	`Config{`
`67`	`67`	`dev_mode,`
`68`	`68`	`database_url:env_string_default("DATABASE_URL","postgres:///pgml"),`
`69`		`-git_sha:env_string_required("GIT_SHA"),`
	`69`	`+git_sha:env!("GIT_SHA").to_string(),`
`70`	`70`	`sentry_dsn:env_string_optional("SENTRY_DSN"),`
`71`	`71`	`static_dir:env_path_default("DASHBOARD_STATIC_DIRECTORY","static"),`
`72`	`72`	`cms_dir:env_path_default("DASHBOARD_CMS_DIRECTORY","../pgml-cms"),`
`@@ -92,7 +92,7 @@ pub fn database_url<'a>() -> &'a str {`
`92`	`92`	`&CONFIG.database_url`
`93`	`93`	`}`
`94`	`94`
`95`		`-pubfngit_sha<'a>() ->&'astr{`
	`95`	`+pubfngit_sha<'a>() ->&'aString{`
`96`	`96`	`&CONFIG.git_sha`
`97`	`97`	`}`
`98`	`98`
`@@ -150,12 +150,6 @@ fn env_is_set(name: &str) -> bool {`
`150`	`150`	`var(name).is_ok()`
`151`	`151`	`}`
`152`	`152`
`153`		`-fnenv_string_required(name:&str) ->String{`
`154`		`-var(name)`
`155`		`-.unwrap_or_else(\|_\|panic!("{} env variable is required for proper configuration", name))`
`156`		`-.to_string()`
`157`		`-}`
`158`		`-`
`159`	`153`	`fnenv_string_default(name:&str,default:&str) ->String{`
`160`	`154`	`matchvar(name){`
`161`	`155`	`Ok(value) => value,`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,17 @@ impl<'a> Tabs<'a> {`
`19`	`19`	`) -> anyhow::Result<Self>{`
`20`	`20`	`let default =match default{`
`21`	`21`	`Some(default) => default,`
`22`		`- _ => tabs`
`23`		`-.get(0)`
`24`		`-.ok_or(anyhow!("There must be at least one tab."))?`
`25`		`-.name,`
	`22`	`+ _ =>{`
	`23`	`+ tabs.get(0)`
	`24`	`+.ok_or(anyhow!("There must be at least one tab."))?`
	`25`	`+.name`
	`26`	`+}`
`26`	`27`	`};`
`27`	`28`
`28`	`29`	`let active = active`
`29`	`30`	`.and_then(\|name\|{`
`30`	`31`	`let found = tabs.iter().find(\|tab\| tab.name == name);`
`31`		`-`
	`32`	`+`
`32`	`33`	`found.map(\|tab\| tab.name)`
`33`	`34`	`})`
`34`	`35`	`.unwrap_or(default);`

Comments

(0)