nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-determinism in generated format string.

Browse Source
This commit is contained in:
jumbatm 2020-09-09 21:23:25 +10:00
parent 3f5e617e36
commit 8b392505ae
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/rustc_macros/src/session_diagnostic.rs
View File

@ -1,11 +1,9 @@
#![deny(unused_must_use)] #![deny(unused_must_use)]
use quote::format_ident;
use quote::quote;
use proc_macro::Diagnostic; use proc_macro::Diagnostic;
use quote::{format_ident, quote};
use syn::spanned::Spanned; use syn::spanned::Spanned;
use std::collections::{HashMap, HashSet}; use std::collections::{BTreeSet, HashMap};
/// Implements #[derive(SessionDiagnostic)], which allows for errors to be specified as a struct, independent /// Implements #[derive(SessionDiagnostic)], which allows for errors to be specified as a struct, independent
/// from the actual diagnostics emitting code. /// from the actual diagnostics emitting code.
@ -577,7 +575,10 @@ impl<'a> SessionDiagnosticDeriveBuilder<'a> {
/// ``` /// ```
/// This function builds the entire call to format!. /// This function builds the entire call to format!.
fn build_format(&self, input: &String, span: proc_macro2::Span) -> proc_macro2::TokenStream { fn build_format(&self, input: &String, span: proc_macro2::Span) -> proc_macro2::TokenStream {
let mut referenced_fields: HashSet<String> = HashSet::new(); // This set is used later to generate the final format string. To keep builds reproducible,
// the iteration order needs to be deterministic, hence why we use a BTreeSet here instead
// of a HashSet.
let mut referenced_fields: BTreeSet<String> = BTreeSet::new();
// At this point, we can start parsing the format string. // At this point, we can start parsing the format string.
let mut it = input.chars().peekable(); let mut it = input.chars().peekable();