- 
                Notifications
    You must be signed in to change notification settings 
- Fork 13.9k
report call site of inlined scopes for large assignment lints #139551
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
      
      
    
  
     Merged
                    Changes from all commits
      Commits
    
    
            Show all changes
          
          
            2 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      
    File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      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
    
  
  
    
              
  
    
      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
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #![feature(large_assignments)] | ||
| #![deny(large_assignments)] | ||
| #![move_size_limit = "1000"] | ||
|  | ||
| //! Tests that with `-Zinline-mir`, we do NOT get an error that points to the | ||
| //! implementation of `UnsafeCell` since that is not actionable by the user: | ||
| //! | ||
| //! ```text | ||
| //! error: moving 9999 bytes | ||
| //! --> /rustc/FAKE_PREFIX/library/core/src/cell.rs:2054:9 | ||
| //! | | ||
| //! = note: value moved from here | ||
| //! ``` | ||
| //! | ||
| //! We want the diagnostics to point to the relevant user code. | ||
|  | ||
| //@ build-fail | ||
| //@ compile-flags: -Zmir-opt-level=1 -Zinline-mir | ||
|  | ||
| pub fn main() { | ||
| let data = [10u8; 9999]; | ||
| let cell = std::cell::UnsafeCell::new(data); //~ ERROR large_assignments | ||
| std::hint::black_box(cell); | ||
| } | 
  
    
      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
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| error: moving 9999 bytes | ||
| --> $DIR/inline_mir.rs:22:16 | ||
| | | ||
| LL | let cell = std::cell::UnsafeCell::new(data); | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ value moved from here | ||
| | | ||
| = note: The current maximum size is 1000, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]` | ||
| note: the lint level is defined here | ||
| --> $DIR/inline_mir.rs:2:9 | ||
| | | ||
| LL | #![deny(large_assignments)] | ||
| | ^^^^^^^^^^^^^^^^^ | ||
|  | ||
| error: aborting due to 1 previous error | ||
|  | 
      
      Oops, something went wrong.
        
    
  
  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.
  
    
  
    
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, you could try just returning early if
inlinedisSome. I think then you should get the improved span that you were looking for. The call site span points to the entire function call indeed, and will result in exactly what you showed. But I'm not sure the more detailed span of the argument still existsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I do this early return, I don't get any lint at all:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm our docs are very underwhelming on this. Maybe use the
source_scope_data.spanifinlinedis set?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the ui test example,
spanpoints toand
source_scope_data.spanpoints toso both seem to be wrong to me.
By the way, both currently don't show up in the actual stderr output, contrary to how it was reported in the issue originally. They both look like this:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm... I guess we lose the argument span entirely in favor of spans from the inlined item. That may be something we may want to adjust, but not in this PR. I'd say we land it with the caller span