diff --git a/pygments/lexers/rust.py b/pygments/lexers/rust.py
index 6a28a88083..0d4bf5fcb3 100644
--- a/pygments/lexers/rust.py
+++ b/pygments/lexers/rust.py
@@ -40,11 +40,10 @@ class RustLexer(RegexLexer):
         'ExactSizeIterator', 'Option', 'Result',
         'Box', 'ToOwned', 'String', 'ToString', 'Vec',
         'Clone', 'Copy', 'Default', 'Eq', 'Hash', 'Ord', 'PartialEq',
-        'PartialOrd', 'Ord',
+        'PartialOrd', 'Ord', 'drop', 'Some', 'None', 'Ok', 'Err',
     ), suffix=r'\b'), Name.Builtin)
 
     builtin_funcs_macros = (words((
-        'drop', 'Some', 'None', 'Ok', 'Err',
         'asm!', 'assert!', 'assert_eq!', 'assert_ne!', 'cfg!', 'column!',
         'compile_error!', 'concat!', 'concat_idents!', 'dbg!', 'debug_assert!',
         'debug_assert_eq!', 'debug_assert_ne!', 'env!', 'eprint!', 'eprintln!',
@@ -53,7 +52,7 @@ class RustLexer(RegexLexer):
         'module_path!', 'option_env!', 'panic!', 'print!', 'println!',
         'stringify!', 'thread_local!', 'todo!', 'trace_macros!',
         'unimplemented!', 'unreachable!', 'vec!', 'write!', 'writeln!',
-    ), suffix=r'\b'), Name.Builtin)
+    )), Name.Function.Magic)
 
     tokens = {
         'root': [