rust-lang
diff --git a/‎src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.rs
-12 b/‎src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.rs
-12
diff --git a/‎src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr
-19 b/‎src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr
-19
diff --git a/‎src/test/ui/rfc-2093-infer-outlives/dont-infer-static.rs
+1-3 b/‎src/test/ui/rfc-2093-infer-outlives/dont-infer-static.rs
+1-3
diff --git a/‎src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr
+2-2 b/‎src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr
+2-2
diff --git a/‎src/test/ui/rfc-2093-infer-outlives/infer-static.rs
-12 b/‎src/test/ui/rfc-2093-infer-outlives/infer-static.rs
-12
diff --git a/‎src/test/ui/rfc-2093-infer-outlives/infer-static.stderr
-12 b/‎src/test/ui/rfc-2093-infer-outlives/infer-static.stderr
-12
@@ -1,7 +1,5 @@
 /*
- * We don't infer `T: 'static` outlives relationships by default.
- * Instead an additional feature gate `infer_static_outlives_requirements`
- * is required.
+ * We don't infer `T: 'static` outlives relationships.
  */
 
 struct Foo<U> {
 
@@ -1,11 +1,11 @@
 error[E0310]: the parameter type `U` may not live long enough
-  --> $DIR/dont-infer-static.rs:8:10
+  --> $DIR/dont-infer-static.rs:6:10
    |
 LL |     bar: Bar<U>
    |          ^^^^^^ ...so that the type `U` will meet its required lifetime bounds...
    |
 note: ...that is required by this bound
-  --> $DIR/dont-infer-static.rs:10:15
+  --> $DIR/dont-infer-static.rs:8:15
    |
 LL | struct Bar<T: 'static> {
    |               ^^^^^^^
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	error[E0310]: the parameter type `U` may not live long enough
`2`		`- --> $DIR/dont-infer-static.rs:8:10`
	`2`	`+ --> $DIR/dont-infer-static.rs:6:10`
`3`	`3`	`\|`
`4`	`4`	`LL \| bar: Bar<U>`
`5`	`5`	\| ^^^^^^ ...so that the type `U` will meet its required lifetime bounds...
`6`	`6`	`\|`
`7`	`7`	`note: ...that is required by this bound`
`8`		`- --> $DIR/dont-infer-static.rs:10:15`
	`8`	`+ --> $DIR/dont-infer-static.rs:8:15`
`9`	`9`	`\|`
`10`	`10`	`LL \| struct Bar<T: 'static> {`
`11`	`11`	`\| ^^^^^^^`