user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #13290 : alexcrichton/rust/rollup, r=alexcrichton

Browse source 
Closes #13285 (rustc: Stop using LLVMGetSectionName)
Closes #13280 (std: override clone_from for Vec.)
Closes #13277 (serialize: add a few missing pubs to base64)
Closes #13275 (Add and remove some ignore-win32 flags)
Closes #13273 (Removed managed boxes from libarena.)
Closes #13270 (Minor copy-editing for the tutorial)
Closes #13267 (fix Option<~ZeroSizeType>)
Closes #13265 (Update emacs mode to support new `#![inner(attribute)]` syntax.)
Closes #13263 (syntax: Remove AbiSet, use one Abi)
This commit is contained in:
bors 2014-04-03 17:17:02 -07:00
commit e7fe207229
64 changed files with 389 additions and 1151 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/etc/emacs/rust-mode.el
View file

@ -196,8 +196,8 @@
;; Special types
(,(regexp-opt rust-special-types 'words) . font-lock-type-face)
;; Attributes like `#[bar(baz)]`
(,(rust-re-grab (concat "#\\[" rust-re-ident "[^]]*\\]"))
;; Attributes like `#[bar(baz)]` or `#![bar(baz)]`
(,(rust-re-grab (concat "#\\!?[" rust-re-ident "[^]]*\\]"))
1 font-lock-preprocessor-face)
;; Syntax extension invocations like `foo!`, highlight including the !