- 
                Notifications
    You must be signed in to change notification settings 
- Fork 13.9k
A scheme for more macro-matcher friendly pre-expansion gating #65974
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Merged
      
      
    Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    
              
                    fbstj
  
              
              reviewed
              
                  
                    Oct 30, 2019 
                  
              
              
            
            
        
          
                src/test/ui/parser/issue-65846-rollback-gating-failing-matcher.rs
              
                Outdated
          
            Show resolved
            Hide resolved
        
      
              
                    fbstj
  
              
              reviewed
              
                  
                    Oct 30, 2019 
                  
              
              
            
            
        
          
                src/test/ui/parser/issue-65846-rollback-gating-failing-matcher.rs
              
                Outdated
          
            Show resolved
            Hide resolved
        
      b436291    to
    e6d4cd6      
    Compare
  
    
              
                    petrochenkov
  
              
              reviewed
              
                  
                    Nov 2, 2019 
                  
              
              
            
            
      
        
              This comment has been minimized.
        
        
      
    
  This comment has been minimized.
e6d4cd6    to
    acbfe3f      
    Compare
  
    3dbf9fb    to
    bceaba8      
    Compare
  
    | @bors r+ | 
| 📌 Commit bceaba8 has been approved by  | 
    
  Centril 
      added a commit
        to Centril/rust
      that referenced
      this pull request
    
      Nov 7, 2019 
    
    
      
  
    
      
    
  
…petrochenkov
A scheme for more macro-matcher friendly pre-expansion gating
Pre-expansion gating will now avoid gating macro matchers that did not result in `Success(...)`. That is, the following is now OK despite `box 42` being a valid `expr` and that form being pre-expansion gated:
```rust
macro_rules! m {
    ($e:expr) => { 0 }; // This fails on the input below due to `, foo`.
    (box $e:expr, foo) => { 1 }; // Successful matcher, we should get `2`.
}
fn main() {
    assert_eq!(1, m!(box 42, foo));
}
```
Closes rust-lang#65846.
r? @petrochenkov
cc @Mark-Simulacrum
    
    
  bors 
      added a commit
      that referenced
      this pull request
    
      Nov 7, 2019 
    
    
      
  
    
      
    
  
Rollup of 5 pull requests Successful merges: - #59789 (Revert two unapproved changes to rustc_typeck.) - #65752 (Use structured suggestions for missing associated items) - #65884 (syntax: ABI-oblivious grammar) - #65974 (A scheme for more macro-matcher friendly pre-expansion gating) - #66017 (Add future incompatibility lint for `array.into_iter()`) Failed merges: - #66056 (rustc_metadata: Some reorganization of the module structure) r? @ghost
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      Labels
      
    S-waiting-on-bors
  Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Pre-expansion gating will now avoid gating macro matchers that did not result in
Success(...). That is, the following is now OK despitebox 42being a validexprand that form being pre-expansion gated:Closes #65846.
r? @petrochenkov
cc @Mark-Simulacrum