Fix some merge fallout.

michaelwoerister · michaelwoerister · commit 93625f12e080 · 2018-03-05T11:05:01.000+01:00
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
@@ -458,7 +458,7 @@ impl Session {
         self.opts.debugging_opts.print_llvm_passes
     }
 
-    /// Get the features enabled for the current compilation session. Do not use
+    /// Get the features enabled for the current compilation session.
     /// DO NOT USE THIS METHOD if there is a TyCtxt available, as it circumvents
     /// dependency tracking. Use tcx.features() instead.
     #[inline]

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ impl Session {`
`458`	`458`	`self.opts.debugging_opts.print_llvm_passes`
`459`	`459`	`}`
`460`	`460`
`461`		`- /// Get the features enabled for the current compilation session. Do not use`
	`461`	`+ /// Get the features enabled for the current compilation session.`
`462`	`462`	`/// DO NOT USE THIS METHOD if there is a TyCtxt available, as it circumvents`
`463`	`463`	`/// dependency tracking. Use tcx.features() instead.`
`464`	`464`	`#[inline]`