context: Escape the dyn keyword properly.

Fixes #1946
rust-lang · Dec 20, 2020 · 98841b3 · 98841b3
1 parent 4ce4b93
commit 98841b3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/ir/context.rs b/src/ir/context.rs
@@ -807,9 +807,9 @@ If you encounter an error missing from this list, please file an issue or a PR!"
             match name {
                 "abstract" | "alignof" | "as" | "async" | "become" |
                 "box" | "break" | "const" | "continue" | "crate" | "do" |
-                "else" | "enum" | "extern" | "false" | "final" | "fn" |
-                "for" | "if" | "impl" | "in" | "let" | "loop" | "macro" |
-                "match" | "mod" | "move" | "mut" | "offsetof" |
+                "dyn" | "else" | "enum" | "extern" | "false" | "final" |
+                "fn" | "for" | "if" | "impl" | "in" | "let" | "loop" |
+                "macro" | "match" | "mod" | "move" | "mut" | "offsetof" |
                 "override" | "priv" | "proc" | "pub" | "pure" | "ref" |
                 "return" | "Self" | "self" | "sizeof" | "static" |
                 "struct" | "super" | "trait" | "true" | "type" | "typeof" |

diff --git a/tests/expectations/tests/keywords.rs b/tests/expectations/tests/keywords.rs
@@ -61,6 +61,10 @@ extern "C" {
     #[link_name = "\u{1}str"]
     pub static mut str_: ::std::os::raw::c_int;
 }
+extern "C" {
+    #[link_name = "\u{1}dyn"]
+    pub static mut dyn_: ::std::os::raw::c_int;
+}
 extern "C" {
     #[link_name = "\u{1}as"]
     pub static mut as_: ::std::os::raw::c_int;

diff --git a/tests/headers/keywords.h b/tests/headers/keywords.h
@@ -12,6 +12,7 @@ int usize;
 int isize;
 int bool;
 int str;
+int dyn;
 
 int as;
 int box;