Merge pull request #1980 from rust-lang/remo/myttkwzsrlrr

Handle redirects more uniformly

Author: Manishearth

src/main.rs

@@ -213,7 +213,7 @@ async fn team(
     section: &str,
     team: &str,
     teams_cache: &Cache<RustTeams>,
-) -> Result<Template, Result<Redirect, Status>> {
+) -> Result<Template, Status> {
     render_team(section, team, ENGLISH.into(), teams_cache).await
 }
 
@@ -231,7 +231,7 @@ async fn team_locale(
     team: &str,
     locale: SupportedLocale,
     teams_cache: &Cache<RustTeams>,
-) -> Result<Template, Result<Redirect, Status>> {
+) -> Result<Template, Status> {
     render_team(section, team, locale.0, teams_cache).await
 }
 
@@ -430,7 +430,7 @@ async fn render_team(
     team: &str,
     lang: String,
     teams_cache: &Cache<RustTeams>,
-) -> Result<Template, Result<Redirect, Status>> {
+) -> Result<Template, Status> {
     match teams::page_data(section, team, teams_cache).await {
         Ok(data) => {
             let page = "governance/group";
@@ -440,16 +440,10 @@ async fn render_team(
         }
         Err(err) => {
             if err.is::<teams::TeamNotFound>() {
-                match (section, team) {
-                    // Old teams URLs
-                    ("teams", "language-and-compiler") | ("teams", "operations") => {
-                        Err(Ok(Redirect::temporary("/governance")))
-                    }
-                    _ => Err(Err(Status::NotFound)),
-                }
+                Err(Status::NotFound)
             } else {
                 eprintln!("error while loading the team page: {}", err);
-                Err(Err(Status::InternalServerError))
+                Err(Status::InternalServerError)
             }
         }
     }

src/redirect.rs

@@ -33,6 +33,8 @@ static PAGE_REDIRECTS: &[(&str, &str)] = &[
         "governance/teams/crates-io",
         "governance/teams/dev-tools#team-crates-io",
     ),
+    ("governance/teams/language-and-compiler", "governance#teams"),
+    ("governance/teams/operations", "governance#teams"),
     // miscellaneous
     ("governance/teams", "governance#teams"),
     ("governance/wgs", "governance#working-groups"),