about summary refs log tree commit diff
path: root/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2020-07-09 11:50:32 -0700
committerGitHub <noreply@github.com>2020-07-09 11:50:32 -0700
commit89c9e970ddbe47622bcc52b135d35508510daa55 (patch)
treea3d85f853606c2815705ac3b240022efdc4faac2 /src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
parent07301e3d549f3f41a3d0a9f31aade293a3b9a3af (diff)
parent81c5bb6a3fb02d1c1c3a4698e9e0e031ef2f4e4e (diff)
downloadrust-89c9e970ddbe47622bcc52b135d35508510daa55.tar.gz
rust-89c9e970ddbe47622bcc52b135d35508510daa55.zip
Rollup merge of #74079 - nnethercote:session-globals, r=nikomatsakis
Eliminate confusing "globals" terminology.

There are some structures that are called "globals", but are they global
to a compilation session, and not truly global. I have always found this
highly confusing, so this commit renames them as "session globals" and
adds a comment explaining things.

Also, the commit fixes an unnecessary nesting of `set()` calls
`src/librustc_errors/json/tests.rs`

r? @Aaron1011
Diffstat (limited to 'src/test/ui-fulldeps/mod_dir_path_canonicalized.rs')
-rw-r--r--src/test/ui-fulldeps/mod_dir_path_canonicalized.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs b/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
index ff7bbafe7c2..836cb07d5d1 100644
--- a/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
+++ b/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
@@ -19,7 +19,7 @@ use std::path::Path;
 mod gravy;
 
 pub fn main() {
-    rustc_ast::with_default_globals(|| parse());
+    rustc_ast::with_default_session_globals(|| parse());
 
     assert_eq!(gravy::foo(), 10);
 }