summaryrefslogtreecommitdiff
path: root/rust-mode.el
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2017-04-11 10:51:33 -0400
committerGitHub <noreply@github.com>2017-04-11 10:51:33 -0400
commit85befb942a11c76caf2b7889ed79453fd4512198 (patch)
treede30a776ce917589a7f5496661e364d5019ed6d1 /rust-mode.el
parent4d651ab274ad41865c31405c70464cbd6f862f06 (diff)
parentf269c5ed312715fe862a32fae79f3e12131b1b7a (diff)
downloadrust-mode-85befb942a11c76caf2b7889ed79453fd4512198.tar.gz
Merge pull request #201 from tromey/question-indentation
fix syntax of "<" appearing after "?"
Diffstat (limited to 'rust-mode.el')
-rw-r--r--rust-mode.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/rust-mode.el b/rust-mode.el
index 5b53277..2307cc0 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -866,6 +866,9 @@ the desired identifiers), but does not match type annotations \"foo::<\"."
((rust-looking-back-symbols rust-mode-keywords)
(rust-looking-back-symbols '("self" "true" "false")))
+ ((rust-looking-back-str "?")
+ (rust-is-in-expression-context 'ambiguous-operator))
+
;; If we're looking back at an identifier, this depends on whether
;; the identifier is part of an expression or a type
((rust-looking-back-ident)