upstream/mercurial-mirror Files · rust/hg-cpython/src/debug.rs

filemerge: be more strict when detecting conflict markers, add `|` markers...

filemerge: be more strict when detecting conflict markers, add `|` markers I received a user complaint about detecting a line that contained 78 `=` followed by `*/` as a conflict marker. We'll never generate that, we generate 7 identical characters and either the end of the line, or a space. Let's be explicit about detecting exactly what we produce to reduce the chances of a false positive. While we're here, add `|||||||` as a detected conflict marker (generated with the `keep-merge3` style conflicts). Differential Revision: https://phab.mercurial-scm.org/D11391

Raphaël Gomès - - Load All Authors

File last commit:

r45406:9f96beb9 default


                r48753:053dd53a

stable

Download file

             debug.rs
        
                    24 lines
            
             | 822 B
            
                | application/rls-services+xml
            
             |
                RustLexer
            
             / rust / hg-cpython / src / debug.rs
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      // debug.rs

      //

      // Copyright 2020 Raphaël Gomès <rgomes@octobus.net>

      //

      // This software may be used and distributed according to the terms of the

      // GNU General Public License version 2 or any later version.

      //! Module to get debug information about Rust extensions.

      use cpython::{PyDict, PyModule, PyResult, Python};

      /// Create the module, with `__package__` given from parent

      pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {

          let dotted_name = &format!("{}.debug", package);

          let m = PyModule::new(py, dotted_name)?;

          m.add(py, "__package__", package)?;

          m.add(py, "__doc__", "Rust debugging information")?;

          let sys = PyModule::import(py, "sys")?;

          let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;

          sys_modules.set_item(py, dotted_name, &m)?;

          Ok(m)

      }

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				// debug.rs
				//
				// Copyright 2020 Raphaël Gomès <rgomes@octobus.net>
				//
				// This software may be used and distributed according to the terms of the
				// GNU General Public License version 2 or any later version.

				//! Module to get debug information about Rust extensions.
				use cpython::{PyDict, PyModule, PyResult, Python};

				/// Create the module, with `__package__` given from parent
				pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
				let dotted_name = &format!("{}.debug", package);
				let m = PyModule::new(py, dotted_name)?;

				m.add(py, "__package__", package)?;
				m.add(py, "__doc__", "Rust debugging information")?;

				let sys = PyModule::import(py, "sys")?;
				let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;
				sys_modules.set_item(py, dotted_name, &m)?;

				Ok(m)
				}